diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index e339514d9..db57bea60 100644 --- a/English.lproj/MainMenu.xib +++ b/English.lproj/MainMenu.xib @@ -9,7 +9,7 @@ YES - + YES @@ -90,7 +90,7 @@ 1 6 - System + System textBackgroundColor 3 @@ -99,7 +99,7 @@ 6 - + controlTextColor 3 @@ -226,8 +226,8 @@ -2033975041 35 - - NSImage + + NSImage info_off @@ -236,7 +236,7 @@ 25 - + {24, 25} @@ -267,8 +267,8 @@ -2033975041 35 - - + + shuffle_on @@ -277,7 +277,7 @@ 25 - + {24, 25} @@ -308,8 +308,8 @@ -2033958657 163 - - + + volume_high @@ -318,7 +318,7 @@ 75 - + {24, 25} @@ -349,8 +349,8 @@ -2033975041 35 - - + + files_off @@ -359,7 +359,7 @@ 25 - + {24, 25} @@ -392,7 +392,7 @@ 2.400000e+01 - + previous @@ -402,7 +402,7 @@ 2.400000e+01 - + play @@ -413,7 +413,7 @@ 2.400000e+01 - + next @@ -456,7 +456,7 @@ 6 - + controlColor 3 @@ -497,8 +497,8 @@ -2033975041 35 - - + + repeat_on @@ -507,7 +507,7 @@ 25 - + {24, 25} @@ -520,8 +520,8 @@ NSToolbarCustomizeToolbarItem - Customize - + Customize + Customize Toolbar @@ -617,8 +617,8 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ runToolbarCustomizationPalette: - {0, 0} - + {0, 0} + YES YES -1 @@ -627,7 +627,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ NSToolbarFlexibleSpaceItem - + Flexible Space @@ -644,23 +644,23 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ YES YES - - + + 1048576 2147483647 - - + + NSMenuCheckmark - - + + NSMenuMixedState NSToolbarSeparatorItem - + Separator @@ -677,17 +677,17 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ YES YES - - + + 1048576 2147483647 - - + + NSToolbarSpaceItem - + Space @@ -704,12 +704,12 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ YES YES - - + + 1048576 2147483647 - - + + @@ -806,7 +806,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ 6 - + headerTextColor @@ -814,12 +814,12 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ 337772096 67110912 - Text Cell + Text Cell 6 - + controlBackgroundColor @@ -841,7 +841,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ 6 - + headerColor @@ -934,7 +934,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA 337772096 2048 - + @@ -960,7 +960,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA 337772096 2048 - + @@ -986,7 +986,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA 337772096 2048 - + @@ -1012,7 +1012,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA 337772096 67110912 - + @@ -1038,7 +1038,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA 337772096 67110912 - + @@ -1064,7 +1064,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA 337772096 2048 - + @@ -1090,7 +1090,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA 337772096 67110912 - + @@ -1160,7 +1160,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA 6 - + gridColor 3 @@ -1270,8 +1270,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + submenuAction: @@ -1282,8 +1282,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA About Cog 2147483647 - - + + @@ -1291,8 +1291,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -1302,8 +1302,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -1311,8 +1311,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -1320,8 +1320,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -1331,8 +1331,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -1340,8 +1340,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA , 1048576 2147483647 - - + + @@ -1351,8 +1351,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -1360,8 +1360,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + submenuAction: @@ -1381,8 +1381,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -1390,8 +1390,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA h 1048576 2147483647 - - + + @@ -1399,8 +1399,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1572864 2147483647 - - + + @@ -1408,8 +1408,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -1419,8 +1419,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -1428,8 +1428,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA q 1048576 2147483647 - - + + _NSAppleMenu @@ -1441,8 +1441,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + submenuAction: @@ -1456,8 +1456,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA o 1048576 2147483647 - - + + @@ -1465,8 +1465,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA O 1048576 2147483647 - - + + @@ -1474,8 +1474,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + submenuAction: @@ -1487,8 +1487,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + _NSRecentDocumentsMenu @@ -1502,8 +1502,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -1511,8 +1511,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA s 1048576 2147483647 - - + + @@ -1522,8 +1522,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -1531,8 +1531,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA w 1048576 2147483647 - - + + @@ -1543,8 +1543,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + submenuAction: @@ -1558,8 +1558,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA z 1048576 2147483647 - - + + @@ -1567,8 +1567,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA Z 1048576 2147483647 - - + + @@ -1578,8 +1578,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -1587,8 +1587,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA x 1048576 2147483647 - - + + @@ -1596,8 +1596,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA c 1048576 2147483647 - - + + @@ -1605,8 +1605,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA v 1048576 2147483647 - - + + @@ -1614,8 +1614,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -1623,8 +1623,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA a 1048576 2147483647 - - + + @@ -1634,8 +1634,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -1643,11 +1643,11 @@ QXBwbGUsIEluYy4sIDIwMDgAA f 1048576 2147483647 - - + + Find Songs - + YES YES @@ -1675,8 +1675,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + submenuAction: @@ -1688,8 +1688,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA p 1048576 2147483647 - - + + @@ -1697,8 +1697,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA . 1048576 2147483647 - - + + @@ -1708,8 +1708,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -1717,8 +1717,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 75yCA 1048576 2147483647 - - + + @@ -1726,8 +1726,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 75yDA 1048576 2147483647 - - + + @@ -1735,8 +1735,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 131072 2147483647 - - + + @@ -1747,8 +1747,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 131072 2147483647 - - + + @@ -1759,8 +1759,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 524288 2147483647 - - + + @@ -1771,8 +1771,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 524288 2147483647 - - + + @@ -1785,8 +1785,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -1794,8 +1794,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 75yAA 1048576 2147483647 - - + + @@ -1803,8 +1803,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 75yBA 1048576 2147483647 - - + + @@ -1814,8 +1814,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -1823,8 +1823,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA i 1048576 2147483647 - - + + @@ -1832,8 +1832,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA d 1048576 2147483647 - - + + @@ -1841,8 +1841,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA F 1179914 2147483647 - - + + @@ -1853,8 +1853,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + submenuAction: @@ -1866,16 +1866,16 @@ QXBwbGUsIEluYy4sIDIwMDgAA CA 1048576 2147483647 - - + + Remove 2147483647 - - + + @@ -1883,8 +1883,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -1894,8 +1894,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -1903,8 +1903,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + submenuAction: @@ -1916,8 +1916,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA r 1572864 2147483647 - - + + @@ -1925,8 +1925,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -1934,8 +1934,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -1945,8 +1945,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -1954,8 +1954,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -1966,8 +1966,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1572864 2147483647 - - + + @@ -1977,19 +1977,19 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + Show All Songs Gw 2147483647 - - + + Show All Songs - + @@ -1998,8 +1998,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA l 1048576 2147483647 - - + + @@ -2009,8 +2009,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -2018,8 +2018,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -2027,8 +2027,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA + 1048576 2147483647 - - + + @@ -2036,8 +2036,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA - 1048576 2147483647 - - + + @@ -2048,8 +2048,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + submenuAction: @@ -2063,8 +2063,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA m 1048576 2147483647 - - + + @@ -2072,8 +2072,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -2083,8 +2083,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -2092,8 +2092,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -2103,8 +2103,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -2112,8 +2112,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1 1048576 2147483647 - - + + @@ -2123,8 +2123,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -2132,8 +2132,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + _NSWindowsMenu @@ -2145,8 +2145,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + submenuAction: @@ -2158,8 +2158,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA ? 1048576 2147483647 - - + + @@ -2237,7 +2237,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA 6 - + textColor @@ -2324,13 +2324,13 @@ QXBwbGUsIEluYy4sIDIwMDgAA YES 6 - + selectedTextBackgroundColor 6 - + selectedTextColor @@ -2604,7 +2604,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA 130560 33554432 - + wheel 0 @@ -2805,16 +2805,16 @@ QXBwbGUsIEluYy4sIDIwMDgAA Current Artist 2147483647 - - + + Current Song 2147483647 - - + + @@ -2824,8 +2824,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -2833,8 +2833,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -2842,8 +2842,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -2853,8 +2853,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -2862,8 +2862,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -2871,8 +2871,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -2889,8 +2889,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -2898,8 +2898,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 - - + + @@ -2923,8 +2923,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 1 - - + + @@ -2933,8 +2933,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 1 - - + + @@ -2943,8 +2943,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 1 - - + + @@ -2953,8 +2953,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 1 - - + + @@ -2963,8 +2963,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 1 - - + + @@ -2973,8 +2973,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 1 - - + + @@ -2983,8 +2983,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 1 - - + + @@ -2993,8 +2993,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1048576 2147483647 1 - - + + @@ -5148,6 +5148,9 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1510 + + YES + @@ -7768,7 +7771,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA - 1817 + 1821 @@ -7795,7 +7798,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA - IBProjectSource + IBProjectSource Application/InvertedToolbarWindow.h @@ -7825,7 +7828,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA - + FileTreeWindow/FileTreeDataSource.h @@ -7877,7 +7880,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA - + Playlist/PlaylistHeaderView.h @@ -7903,7 +7906,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA - + Utils/ClickField.h @@ -7983,14 +7986,14 @@ QXBwbGUsIEluYy4sIDIwMDgAA YES - id - - - - - - - + id + + + + + + + @@ -8047,7 +8050,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA - + Application/AppController.h @@ -8063,8 +8066,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA YES - - + + @@ -8085,7 +8088,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA - + Spotlight/SpotlightWindowController.h @@ -8137,7 +8140,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA - + Utils/TrackingSlider.h @@ -8179,8 +8182,8 @@ QXBwbGUsIEluYy4sIDIwMDgAA YES - - + + @@ -8197,7 +8200,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA - + FileTreeWindow/FileTreeWindowController.h @@ -8240,9 +8243,9 @@ QXBwbGUsIEluYy4sIDIwMDgAA YES - - - + + + @@ -8265,7 +8268,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA - + Feedback/FeedbackController.h @@ -8286,7 +8289,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA - + ThirdParty/GCWindowMenu/PopupButton.h @@ -8312,7 +8315,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA - + Playlist/EntriesController.h @@ -8356,10 +8359,10 @@ QXBwbGUsIEluYy4sIDIwMDgAA YES - - - - + + + + @@ -8376,7 +8379,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA - + Playlist/PlaylistView.h @@ -8394,10 +8397,10 @@ QXBwbGUsIEluYy4sIDIwMDgAA - + - + FileTreeWindow/PathWatcher.h @@ -8447,16 +8450,16 @@ QXBwbGUsIEluYy4sIDIwMDgAA YES - - - - - - - - - - + + + + + + + + + + @@ -8475,7 +8478,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA - + Playlist/PlaylistController.h @@ -8501,7 +8504,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA - + ThirdParty/GCWindowMenu/GCOneShotEffectTimer.h @@ -8527,7 +8530,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA - + ThirdParty/AppleRemote/AppleRemote.h @@ -8553,7 +8556,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA - + ThirdParty/NDHotKeys/NDHotKeyEvent.h @@ -8600,7 +8603,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA NSTableView - + Playlist/DNDArrayController.h @@ -8673,7 +8676,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA PlaylistController - + Playlist/PlaylistLoader.h @@ -8703,7 +8706,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA showPrefs: - + YES @@ -8715,7 +8718,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA - + Preferences/PreferencesController.h @@ -8805,24 +8808,24 @@ QXBwbGUsIEluYy4sIDIwMDgAA YES - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -8849,7 +8852,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA - + Application/PlaybackController.h @@ -8912,17 +8915,17 @@ GIUYhhiHGIgYiRiKGIsYjBiNGI4YjxiQGJEYkhiTGJQYlRiWGJcYmBiZGJoYmxicGJ0YnhifGKAYoRii GKMYpBilGKYYpxioGKkYqhirGKwYrRiuGK8YsBixGLIYsxi0GLUYthi3GLgYuRjCGMsaaBwFHAYcBxwI HAkcChwLHAwcDRwOHA8cEBwRHBIcExwUHBUcFhwXHBgcGRwaHBscHBwdHB4cHxwgHCEcIhwjHCQcJRwm HCccKBwpHCocKxwsHC0cLhwvHDAcMRwyHDMcNBw1HDYcNxw4HDkcOhw7HDwcPRw+HD8cQBxBHEIcQxxE -HEUcRhxHHEgcSRxKHEscTBxNHE4cTxxQHFEcUhxTHFQcVRxWAFUcVxxYHFkcWhxbHFwcXRxeHF8cYBxh +HEUcRhxHHEgcSRxKHEscTBxNHE4cTxxQHFEcUhxTHFQcVRxWHFccWBxZAFUcWhxbHFwcXRxeHF8cYBxh HGIcYxxkHGUcZhxnHGgcaRxqHGscbBxtHG4cbxxwHHEcchxzHHQcdRx2HHcceBx5HHocexx8HH0cfhx/ -HIAcgRyCHIMchByFHIYchxyIHIkcihyLHIwcjRyOHI8BOByQHJEckhyTHJQclRyWHJccmByZHJocmxyc +HIAcgRyCHIMchByFHIYchxyIHIkcihyLHIwcjRyOHI8ckByRHJIckxyUHJUclhyXHJgcmQE4HJocmxyc HJ0cnhyfHKAcoRyiHKMcpBylHKYcpxyoHKkcqhyrHKwcrRyuHK8csByxHLIcsxy0HLUcthy3HLgcuRy6 HLscvBy9HL4cvxzAHMEcwhzDHMQcxRzGHMccyBzJHMocyxzMHM0czhzPHNAc0RzSHNMc1BzVHNYc1xzY -HNkc2hzbHNwc3RzeHN8CpRzgHOEc4hzjHOQc5RzmHOcc6BzpHOoc6xzsHO0c7hzvHPAc8RzyHPMc9Bz1 +HNkc2hzbHNwc3RzeHN8c4BzhHOICpRzjHOQc5RzmHOcc6BzpHOoc6xzsHO0c7hzvHPAc8RzyHPMc9Bz1 HPYc9xz4HPkc+hz7HPwc/Rz+HP8dAB0BHQIdAx0EHQUdBh0HHQgdCR0KHQsdDB0NHQ4dDx0QHREdEh0T -HRQdFR0WHRcdGB0ZHRodGx0cHR0dHh0fHSAdIR0iHSMdJB0lHSYdJx0oHSkdKh0rHSwdLR0uHS8dMAPz -HTEdMh0zHTQdNR02HTcdOB05HToCpB07HTwdPR0+HT8dQB1BHUIdQx1EHUUdRh1HHUgdSR1KHUsdTB1N -HU4dTx1QHVEdUh1THVQdVR1WHVcdWB1ZHVodWx1cHV0dXh1fHWAdYQDWHWIdYx1kBNodZR1mHWcdaB1p -HWodax1sHW0dbh1vHXAdcR1yHXMddB11HXYddx14HXkdeh17HXwdfR1+HX8dgB2BHYIdgx2EHYUdhh2H +HRQdFR0WHRcdGB0ZHRodGx0cHR0dHh0fHSAdIR0iHSMdJB0lHSYdJx0oHSkdKh0rHSwdLR0uHS8dMB0x +HTIdMwPzHTQdNR02HTcdOB05HTodOx08HT0CpB0+HT8dQB1BHUIdQx1EHUUdRh1HHUgdSR1KHUsdTB1N +HU4dTx1QHVEdUh1THVQdVR1WHVcdWB1ZHVodWx1cHV0dXh1fHWAdYR1iHWMdZB1lHWYdZx1oHWkdagDW +HWsdbB1tBNodbh1vHXAdcR1yHXMddB11HXYddx14HXkdeh17HXwdfR1+HX8dgB2BHYIdgx2EHYUdhh2H HYgdiR2KHYsdjB2NHY4djx2QHZEdkh2THZQdlR2WHZcdmB2bHZ4doVUkbnVsbN8QEgANAA4ADwAQABEA EgATABQAFQAWABcAGAAZABoAGwAcAB0AHgAfACAAIQAiACMAJAAlACYAJwAoACkAKgArACwALQAuAC8A MFZOU1Jvb3RWJGNsYXNzXU5TT2JqZWN0c0tleXNfEA9OU0NsYXNzZXNWYWx1ZXNfEBlOU0FjY2Vzc2li @@ -8930,7 +8933,7 @@ aWxpdHlPaWRzVmFsdWVzXU5TQ29ubmVjdGlvbnNbTlNOYW1lc0tleXNbTlNGcmFtZXdvcmtdTlNDbGFz c2VzS2V5c1pOU09pZHNLZXlzXU5TTmFtZXNWYWx1ZXNfEBlOU0FjY2Vzc2liaWxpdHlDb25uZWN0b3Jz XU5TRm9udE1hbmFnZXJfEBBOU1Zpc2libGVXaW5kb3dzXxAPTlNPYmplY3RzVmFsdWVzXxAXTlNBY2Nl c3NpYmlsaXR5T2lkc0tleXNZTlNOZXh0T2lkXE5TT2lkc1ZhbHVlc4ACgQdegQRagQW+gQddgQFagQTQ -gAWBBb2BBb+BBNGBB1uAAIAGgQTPgQdcEQcbgQXA0gAOADIAMwA0W05TQ2xhc3NOYW1lgASAA11OU0Fw +gAWBBb2BBb+BBNGBB1uAAIAGgQTPgQdcEQcfgQXA0gAOADIAMwA0W05TQ2xhc3NOYW1lgASAA11OU0Fw cGxpY2F0aW9u0gA3ADgAOQA6WCRjbGFzc2VzWiRjbGFzc25hbWWiADoAO15OU0N1c3RvbU9iamVjdFhO U09iamVjdF8QEElCQ29jb2FGcmFtZXdvcmvSAA4APgA/AEBaTlMub2JqZWN0c4EBWaEAQYAH2wBDAA4A RABFAEYARwBIAEkASgBLAEwATQBOAE8AUABQAFIAUwBUAFUAVgBXXE5TV2luZG93Vmlld1xOU1NjcmVl @@ -9865,41 +9868,41 @@ bWUpXxAeTWVudSBJdGVtIChTa2lwIHRvIE5leHQgQWxidW0pXFNlcGFyYXRvci0xOV8QHk1lbnUgSXRl bSAoSW5jcmVhc2UgRm9udCBTaXplKV8QGlRleHQgRmllbGQgQ2VsbCAoQml0cmF0ZTopW1NlcGFyYXRv ci04XxATVGFibGUgQ29sdW1uIChwYXRoKV8QIE1lbnUgSXRlbSAoU2hvdyBTcG90bGlnaHQgUGFuZWwp XxAWVG9vbGJhciBJdGVtIChTaHVmZmxlKdIADgA+AbEYu4BdpgKGBtkBIgQKALoEJICSgQFtgDiA54Af -gOvSAA4APgGxGMSAXaYCnQcKAToELwDYBD6Ak4EBboA5gOiAIIDs0gAOAD4BsRjNgF2vEQGaBnoKowZO -AscG2gaxDPsEYgaqBlYGYACUBhAGewYlAkAGtxHGBngGUQZwEcgGOgxOCdsGdgatBOoHXhHbBhoGpAaD -BuAMnAYREd8GdA0dAJEGIgaZBksGVQuVBi4GkhHoBg8GJgYXBo4GjBHtEe4HZgZMBocGNQUEBqYR9ArV -EfYNNwXwCyYC/gKbEf8NqhIKCAoMPwYhBmQGggsTBlcGawoiEhMATQ/kBkYGpwZqEhkI+ge0BqEGQQYy -DLMIZAZsB3kLvQYvBWMMCgZ9BawLhw4WCHIG2QZNBmMGOwZ8B0oGmAZZCf4L6QdCCMEEXgfrCIsGjQZh -AJYSRQRgEkcGGwtPEkwI9QvoBl0KEhJUBmcGogjzBi0H5wj4BjAGHwadBF0GhBJjCpkGSgaTAI4Ghgg+ -CmUScAacBF8JNAY3BRwGJAZmBlIKcwZpBkkSew1oBogGRwYzBicGKgaWAoYGmgbdBo8SggPgBloGKQiF -BjwNkg0ODNoGqQCVAiwOlgYgBm8IhAybCHoH1AkkAI8GnwCZBGEGeQYrBlMILwtxAJIGQAC6DqYGEgY9 -AJcC2QZ/Eb8GXwnvEcEIRBHDBnEGYgeHBhMMiAE3Da4EYw32DnMB4QZFDxEEdg0GDAkGFhHXBn4R2QkQ -Bj8GpQqXBqMGbQqcCR4IEgwNDbEGkAo1BjEKlgY5BooAQQijBTQGTwZuBGQGHgZyEfMAVwCQBUwSAA48 -B+4I9AZ3EWkLqQpCDAgSCQAfB3ASDw3qC2IAmArEBqgGKAZlBlAOUQYUBhwLBAYsEh0Glws0AJoSIA8a -B+gGIxInA+sGNgZDBq8M6AY0B3EFlAxdAxIEZRI2EjcGdQaUArMGWwq0CpoIVgZECBoLQBJLBq4DJAas -A98GqwabA/YMuwSoBGcOvwZYCvUGoA7WBp4SXQ60D0EBzQaVBokSYgEiCNoC7QV6AJMKKgxxBosNVgYV -EnIGgQawBlQOiwZIBhgGGQ0pBoAHkAbOClEGPgqdANUSgAaRBl4Iswj/BnMMxQqYCpsGXAxwBjgKgAvZ -BCQGxQgkBmgGhQYdAzgSnwwOBkILzAQKDioSpARmEqcK5YEDcoECcoEC7oCggQFngQRXgQMegQEggQQ9 -gQMMgQMvgHeBAWCBA3eBAe2AfIEBXIEEa4EDbIEC+IEDXIEEoYECmIEC5oECMYEDaYEESIEBFYEBjIEE -sYEBsYEEJoEDi4EBaoEC/4EBZoEEf4EDY4EDKIBRgQHbgQP4gQLggQMGgQKzgQJKgQPcgQSYgQFbgQHy -gQGmgQPKgQO2gQRegQRkgQGNgQLlgQOUgQJogQEagQQugQSmgQJ9gQSAgQMwgQFRgQKSgLKAloEEY4ED -UYEErYEBvoEC4YEB1oEDPYEDhoECi4EDEYEDToECS4EEv4DggQPtgQLCgQQzgQNNgQRhgQIvgQGngQQc -gQKygQJdgQMHgQHXgQNQgQGTgQK+gQJPgQEugQLbgQN+gQE+gQKvgQNtgQHcgQFtgQLqgQM4gQKdgQN8 -gQGFgQP0gQMYgQI+gQLMgQGEgQHugQEBgQG1gQHjgQPFgQMzgJuBBIGBARaBBIWBAbOBAp6BBMaBAgSB -As+BAyaBAkWBBM2BA0aBBB6BAfyBAkiBAbqBAiqBAlOBAcuBBA2A9IEDjYEEkYECe4EC1IED4IAcgQOT -gQHMgQJggQRsgQQJgQERgQIIgQJugQEfgQHpgQNEgQL9gQJlgQNKgQLSgQSHgQM+gQOYgQLGgQJfgQH0 -gQI9gQPsgJKBA/+BAWiBA82BBLOBAU+BAxyBAjiBAeGBAqKBA0uBAyOBAxSBBDmAj4B6gQOQgQHSgQNb -gQHmgQMCgQHdgQGugQIlgDWBBBSAuYEBG4EDcIECQoEC/oEBx4ECqIBjgQKugB+BA5WBAYOBAqOApYCo -gQODgQRbgQMqgQI5gQSMgQHOgQR6gQNdgQM2gQGZgQGIgQL5gDyBA1KBASWBA2SBA4eAaIECvYEDt4D8 -gQMigQLZgQGYgQSjgQOCgQSZgQICgQKsgQQqgQJzgQQigQNXgQKGgQIngQG/gQLcgQNUgQPSgQJQgQJY -gQJwgQKVgQOjgAeBAeiBASSBAvCBA1mBASqBAcaBA1+BBHiAC4BBgQEpgQR5gQN4gQG3gQIAgQNqgQRJ -gQK5gQJUgQLXgQRngAKBAZWBBG6BA2GBAqSAr4ECeYEENoEB9YEDQoEC9oEDf4EBi4EBvYECiIECRIEE -qIED8YECloDVgQSvgQO4gQG0gQHggQScgQFJgQJsgQK4gQRRgQMZgQJkgQGSgQE4gQLrgLSBAS+BBJOB -BJCBA2eBA+SAnoEDHYECdYECf4EB04ECvIEBwoECmYEEiIEETYC8gQRFgOOBBEKBBASBAUWBAwiBAQeB -ATqBA52BAxOBAoWBBBiBA6SBBBKBBI2BA5mBA8aAZoED6YEDnIEEc4A4gQH2gKqBATOAcIECTIEC8YED -soEDOYEBkYEEmoEDhYEEVIEDBIEDjoECy4EBrIEBrYEDK4EDhIEBmoEBYoECWYECp4ECiYAjgQSGgQPZ -gQMngQHqgQH+gQNggQMNgQJ3gQKDgQMhgQLzgQKRgQJpgQLHgOuBAWGBAcOBA0iBA4+BAcGAvoEEtoEC -3YECtoECw4DngQNzgQSSgQE0gQRigQKB0gAOAD4BsRpqgF2vEQGaGmsabBptGm4abxpwGnEachpzGnQa +gOvSAA4APgGxGMSAXaYCnQcKAToELwDYBD6Ak4EBboA5gOiAIIDs0gAOAD4BsRjNgF2vEQGaBkQKowLH +BtoGsQz7BGIGqgYzBnYGXgCUBjUGXwJABrcGShHGBlQRyAYRDE4GbAYmBmIJ2wZrBigGSwatBOoHXhHb +BikGpAbgDJwGNxHfDR0AkQaZC5UGkhHoBo4GjAYnBkMR7RHuB2YGcgUEBj0GVQZXBoYGphH0BnwK1QZF +EfYNNwYSBfALJgZRAv4CmxH/DaoSCggKDD8GFgYxBnAGagsTBloGaAoiEhMATQYwD+QGpwZGBjkSGQj6 +B7QGoQZ7BoMGZAYvBoAGMgyzCGQGegd5C70FYwwKBiwGbQZ4BawLhwYXDhYIcgbZBlkGZgdKBpgGhwn+ +C+kHQgjBBF4H6wiLBlgGjQCWEkUEYBJHC08GPxJMBn4I9QvoBisGGAoSElQGTwaiCPMGOwfnCPgGnQRd +BhAGiRJjCpkGUwaTAI4GNgZ9CD4KZRJwBpwEXwZxBmMJNAY+BRwGIApzEnsNaAYiBpoGlgKGBt0GWwaP +EoID4AiFDZIGPA0ODNoGEwYaAJUCLA6WBqkGVgZlCIQMmwh6B9QJJACPBp8GdACZBGEGFAZBCC8LcQCS +ALoOpgCXAtkGKhG/BiMGLgnvEcEIRBHDBkgHhwyIATcNrgRjBjQN9g5zAeEGJA8RBHYNBgwJBhUR1waF +EdkJEAZcBqUGQAqXBqMKnAaECR4GdQgSDA0NsQZOBpAKNQYPBhwGfwqWBooAQQijBTQEZBHzAFcGOACQ +BUwSAA48B+4I9AZuEWkLqQZQCkIMCBIJAB8HcBIPDeoLYgCYCsQGqA5RCwQGTAYeEh0GlwZSBoILNACa +EiAPGgZNB+gSJwPrBq8M6AZJBncGYAdxBZQGeQxdBh0DEgRlEjYSNwYhBpQCswZCBnMKtAqaCFYGJQga +C0AGHxJLBhkGrgMkBmcGLQPfBqwGqwabA/YMuwZpBogEqARnDr8K9QagDtYGnhJdDrQPQQHNBpUSYgEi +CNoC7QV6AJMKKgxxBosNVgYbEnIGsA6LBl0NKQeQBmEGzgpRBkcKnQDVEoAGkQizCP8MxQqYCpsMcAqA +C9kEJAbFCCQGgQY6AzgSnwwOC8wECg4qEqQEZhKnCuUGb4ECvIECcoCggQFngQRXgQMegQEggQQ9gQJf +gQNpgQMngHeBAmiBAyqAfIEBXIEC1IEEa4EDBIEEoYEBZoEC5oEDUIEB8oEDNoECMYEDToEB9YEC4IEE +SIEBFYEBjIEEsYECOIEEJoEBaoEC/4ECboEEf4EDKIBRgQP4gQKzgQPcgQSYgQPKgQO2gQH0gQK4gQRe +gQRkgQGNgQNfgQEagQKjgQMGgQMRgQOTgQQugQSmgQN8gQJ9gQK9gQSAgQMwgQGDgQFRgQKSgQL4gLKA +loEEY4EDUYEErYEBvoEC4YEBmIECWIEDXIEDTYECi4EDHIEDSIECS4EEv4DggQJTgQPtgQQzgQLCgQKV +gQRhgQIvgQGngQQcgQN3gQOLgQM9gQJPgQOEgQJdgQMHgQHXgQNygQGTgQK+gQEugQLbgQJEgQNXgQNs +gQE+gQKvgQGmgQNtgQHcgQFtgQMYgQNEgQGFgQP0gQOUgQI+gQLMgQGEgQHugQEBgQG1gQHjgQMTgQPF +gJuBBIGBARaBBIWBAp6BAqyBBMaBA4KBAgSBAs+BAkKBAayBAkWBBM2BAvCBBB6BAfyBAp2BAbqBAiqB +BA2A9IEBYIEDnIEEkYECe4EC/oED4IAcgQJsgQN+gQHMgQJggQRsgQQJgQERgQNdgQM4gQIIgQKngQEf +gQHSgQJlgQSHgQM+gQHbgQP/gQPsgJKBAWiBAx2BA82BBLOBAU+BAeGBA0uBAqKBAyOBAxSBAYiBAbGA +j4B6gQOQgQQ5gQMMgQNCgQHmgQMCgQHdgQGugQIlgDWBBBSBA2OAuYEBG4EBi4ECsoEBx4ECqIBjgB+B +A5WApYCogQI9gQRbgQHggQJKgQI5gQSMgQHOgQR6gQLLgQGZgQL5gDyBA1KBASWBAmSBA2SBA4eAaIEB +6YEDt4D8gQMigQLZgQGRgQSjgQOPgQSZgQICgQMhgQQqgQKugQJzgQQigQKGgQONgQIngQNngQG/gQLc +gQNUgQLugQPSgQJQgQFbgQG9gQODgQJwgQOjgAeBAeiBASSBASqBBHiAC4ECkYBBgQEpgQR5gQN4gQG3 +gQIAgQNZgQRJgQK5gQL2gQJUgQLXgQRngAKBAZWBBG6BA2GBAqSAr4ECeYEENoEDf4ECiIEC5YEBxoEE +qIED8YEC/YEDhoECloDVgQSvgQO4gQLqgQG0gQScgQFJgQRRgQMZgQLSgQNqgQMvgQGSgQE4gQNwgQLr +gQHBgLSBAS+BBJOBBJCBAdaBA+SAnoECtoEDYIECdYECf4EB04EB7YEBwoECmYEBy4EEiIEBrYEETYC8 +gQNGgQJIgOOBBEWBBEKBBASBAUWBAwiBA0qBA5iBAQeBATqBA52BAoWBBBiBA6SBBBKBBI2BA5mBA8aA +ZoED6YEEc4A4gQH2gKqBATOAcIECTIEC8YEDsoEDOYEBs4EEmoEEVIEDjoEDJoEDK4EBmoEDM4EBYoEC +WYECxoECiYAjgQSGgQPZgQHqgQH+gQMNgQJ3gQKDgQLzgQJpgQLHgOuBAWGBAcOBA4WBApiAvoEEtoEC +3YECw4DngQNzgQSSgQE0gQRigQKBgQNb0gAOAD4BsRpqgF2vEQGaGmsabBptGm4abxpwGnEachpzGnQa dRp2GncaeBp5Gnoaexp8Gn0afhp/GoAagRqCGoMahBqFGoYahxqIGokaihqLGowajRqOGo8akBqRGpIa kxqUGpUalhqXGpgamRqaGpsanBqdGp4anxqgGqEaohqjGqQapRqmGqcaqBqpGqoaqxqsGq0arhqvGrAa sRqyGrMatBq1GrYatxq4Grkauhq7GrwavRq+Gr8awBrBGsIawxrEGsUaxhrHGsgayRrKGssazBrNGs4a @@ -9933,26 +9936,26 @@ voEGv4EGwIEGwYEGwoEGw4EGxIEGxYEGxoEGx4EGyIEGyYEGyoEGy4EGzIEGzYEGzoEGz4EG0IEG0YEG DoEHD4EHEIEHEYEHEoEHE4EHFIEHFYEHFoEHF4EHGIEHGYEHGoEHG4EHHIEHHYEHHoEHH4EHIIEHIYEH IoEHI4EHJIEHJYEHJoEHJ4EHKIEHKYEHKoEHK4EHLIEHLYEHLoEHL4EHMIEHMYEHMoEHM4EHNIEHNYEH NoEHN4EHOIEHOYEHOoEHO4EHPIEHPYEHPoEHP4EHQIEHQYEHQoEHQ4EHRIEHRYEHRoEHR4EHSIEHSYEH -SoEHS4EHTIEHTYEHToEHT4EHUIEHUYEHUoEHU4EHVIEHVYEHVoEHV4EHWIEHWYEHWhEGphEF2REGexEG -YBEESxEDVREFuREDJxEHDRCzECcRBgMQtREGtxEC0xEGAhDiEJAQkhDBEQE6EQEZEQaREIYRBdQRAs0R -BuMRBeIRBXsRAR0RBj8RBUwRBk8RBeERBLoRBXQQnBEFRBEEKBEGbRB/EQYoEQV9EHoRAu8QxhEGcxEG -ahEGfhEBBhEC7BEDUxEG5xA4EIMQURCYEQVKEQatEQXkEQbpEQEcEQXcEK4QBREFwRECvhEGWxEGSRCP -EQZMEQEbEQGkEEgRBpIRBqQRBqIRBeARATQRBj0QxREF1REG7REBMREFGRECwhEETBEBMxEBwBEHEREC -8BEBJxBvEJ4RBlARAgERBXoRBxkRBegRAxgRBUIRBskRAgUQkRB+ENoRAWgRBqERBqoRBjYQOREFnxEF -RREEbRCBEJYRAacRBwYRAQ0RBdMRBuARBCkRBl4RAaIRAYcRAaoRASoRBqkRARgRAQ8RBMERBv0RBScT -//////////0RAWcRBnoRARMRASsRASAQsBEBOREGLxDREQWBEQQ3EQNjEQINEQV1EQYgEQEXEQEVEBcQ -lREGLhDQEQEQEQHfEQXlEI4RBtwRAQUQpBEFRhECzxEEchEGoxEGnBEFQxAlEQHhEQWbEQbwEQZIEQYq -EQHPEQWaEQXYEQMKEQaNEIsRATIRATgRBTwRBCcRAakRBvwRBkoRBgERBmsRBUkRBSgRARERBrkQfREC -CBEF7hEGDxEGOREF/REDJhEGQxDsEQcCEQanEQarEQZkEQLWEQYeEQVAEJkRBUcRBmcRBmgRBvUQHRCv -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 @@ -10271,27 +10274,27 @@ wgDi2QDi5gDi8wDjAQDjDQDjGQDjLQDjOQDjUwDjbADkFQDkLgDkQgDkZADkcQDkhgDkmwDksgDk1wDk xQDm1wDm6QDm/gDnCgDnJADnMQDnUwDnYQDnegDnlwDnpADnrQDnwgDoCQDoIQDoLADoSQDoXQDodgDo hQDopADouQDoxwDo3wDo+QDpGQDpJgDpOgDpWADpcQDpewDpkgDppQDpuwDp1QDp6gDqAgDqFgDqLQDq SQDqXgDqfQDq2wDq/ADrCQDrKgDrRwDrUwDraQDrjADrpQDrrgDrsADrvQDrvwDrwgDrxADrxgDryADr -ygDr0wDr1QDr4gDr5ADr5wDr6QDr6wDr7QDr7wDr+ADr+gDvMgDvNQDvOADvOwDvPQDvQADvQwDvRgDv -SQDvTADvTwDvUgDvVADvVwDvWgDvXQDvXwDvYgDvZQDvaADvawDvbgDvcQDvdADvdwDvegDvfQDvgADv -gwDvhgDviQDvjADvjwDvkgDvlQDvmADvmwDvngDvoQDvpADvpgDvqQDvrADvrwDvsgDvtQDvuADvuwDv +ygDr0wDr1QDr4gDr5ADr5wDr6QDr6wDr7QDr7wDr+ADr+gDvMgDvNQDvOADvOgDvPQDvQADvQwDvRgDv +SQDvTADvTwDvUgDvVADvVwDvWgDvXADvXwDvYgDvZQDvaADvawDvbgDvcQDvdADvdwDvegDvfQDvgADv +gwDvhgDviQDvjADvjwDvkgDvlQDvmADvmwDvngDvoQDvpADvpwDvqQDvrADvrwDvsgDvtQDvuADvuwDv vgDvwQDvxADvxwDvygDvzQDv0ADv0wDv1gDv2QDv3ADv3wDv4gDv5QDv6ADv6wDv7gDv8QDv9ADv9wDv -+QDv+wDv/gDwAQDwBADwBwDwCgDwDQDwEADwEwDwFgDwGQDwHADwHwDwIgDwJADwJwDwKgDwLQDwMADw ++gDv/QDv/wDwAQDwBADwBwDwCgDwDQDwEADwEwDwFgDwGQDwHADwHwDwIgDwJQDwKADwKwDwLQDwMADw MwDwNgDwOQDwPADwPwDwQgDwRQDwSADwSwDwTgDwUQDwVADwVwDwWgDwXQDwYADwYwDwZgDwaQDwbADw -bwDwcgDwdQDweADwewDwfgDwgQDwhADwhwDwigDwjQDwkADwkwDwlgDwmQDwnADwngDwoQDwpADwpwDw -qgDwrQDwsADwswDwtgDwuQDwvADwvwDwwgDwxQDwyADwywDwzgDw0QDw1ADw1wDw2gDw3ADw3wDw4gDw -5QDw6ADw6wDw7QDw8ADw8wDw9gDw+QDw/ADw/wDxAgDxBQDxCADxCwDxDgDxEQDxFADxFwDxGgDxHQDx -IADxIwDxJgDxKQDxLADxLwDxMgDxNADxNwDxOgDxPQDxQADxQwDxRgDxSQDxTADxTwDxUgDxVQDxWADx -WwDxXQDxXwDxYgDxZQDxaADxawDxbgDxcQDxdADxdwDxeQDxfADxfgDxgQDxhADxhwDxigDxjQDxkADx -kgDxlQDxlwDxmgDxnQDxoADxogDxpADxpwDxqgDxrQDxsADxswDxtgDxuQDxvADxvwDxwgDxxQDxyADx -ygDxzQDx0ADx0wDx1gDx2ADx2wDx3gDx4ADx4wDx5gDx6QDx7ADx7wDx8gDx9QDx+ADx+wDx/gDyAQDy -BADyBwDyCgDyDQDyEADyEwDyFgDyGQDyHADyHwDyIgDyJQDyJwDyKgDyLQDyMADyMwDyNgDyOQDyPADy -PwDyQQDyQwDyRgDySQDyTADyTwDyUgDyVQDyWADyWwDyXgDyYQDyZADyZgDyaQDybADybwDycgDydADy -dwDyegDyfQDygADygwDyhgDyiQDyjADyjwDykgDylQDymADymwDynQDyoADyowDypgDyqQDyrADyrwDy -sgDytQDyuADyuwDyvgDywQDyxADyxwDyyQDyzADyzwDy0gDy1QDy2ADy2gDy3QDy4ADy4wDy5gDy6QDy -7ADy7wDy8gDy9QDy9wDy+gDy/ADy/wDzAgDzBQDzCADzCwDzDgDzEQDzFADzFwDzGgDzHQDzIADzIwDz -JgDzKQDzKwDzLgDzMQDzNADzNgDzOQDzOwDzPgDzQADzQwDzRgDzSQDzTADzTwDzUgDzVQDzWADzWwDz -XgDzYQDzZADzZwDzagDzbQDzcADzcwDzdgDzeQDzfADzfgDzgQDzhADzhwDzigDzjQDzkADzkwDzlgDz -mQDznADznwDzogDzpQDzqADzqgDzrQDzsADzswDztgDzuQDzuwDzvgDzwQDzxADzxwDzyQDzzADzzwDz +bwDwcgDwdQDweADwewDwfgDwgQDwhADwhwDwigDwjQDwkADwkwDwlgDwmQDwnADwnwDwogDwpQDwqADw +qwDwrgDwsQDwtADwtgDwuQDwvADwvwDwwgDwxQDwyADwywDwzgDw0QDw1ADw1wDw2gDw3QDw4ADw4wDw +5gDw6QDw7ADw7wDw8gDw9ADw9wDw+gDw/QDxAADxAwDxBgDxCADxCwDxDgDxEQDxFADxFwDxGgDxHQDx +IADxIwDxJgDxKQDxLADxLwDxMgDxNQDxOADxOwDxPgDxQQDxQwDxRgDxSQDxTADxTwDxUgDxVQDxWADx +WwDxXgDxYQDxZADxZwDxaQDxawDxbgDxcQDxdADxdwDxegDxfQDxgADxgwDxhgDxiADxiwDxjgDxkADx +kwDxlgDxmQDxnADxnwDxoQDxowDxpgDxqADxqgDxrQDxsADxswDxtgDxuQDxvADxvwDxwgDxxQDxyADx +ywDxzQDx0ADx0wDx1gDx2QDx3ADx3gDx4QDx5ADx5gDx6QDx7ADx7wDx8gDx9QDx+ADx+wDx/gDyAQDy +BADyBwDyCgDyDQDyEADyEwDyFgDyGQDyHADyHwDyIgDyJQDyKADyKwDyLgDyMQDyNADyNwDyOQDyPADy +PwDyQgDyRQDyRwDySgDyTADyTwDyUgDyVQDyWADyWwDyXgDyYQDyZADyZwDyagDybQDycADycgDydQDy +eADyewDyfgDygADygwDyhgDyiQDyjADyjwDykgDylQDymADymwDyngDyoQDyowDypgDyqQDyrADyrwDy +sgDytQDyuADyuwDyvgDywQDyxADyxwDyygDyzQDy0ADy0wDy1QDy2ADy2wDy3gDy4QDy5ADy5gDy6QDy +7ADy7wDy8gDy9QDy+ADy+wDy/gDzAQDzBADzBwDzCgDzDADzDwDzEgDzFADzFwDzGgDzHQDzIADzIwDz +JgDzKQDzLADzLwDzMgDzNQDzOADzOwDzPgDzQQDzRADzRwDzSQDzTADzTwDzUQDzVADzVgDzWQDzWwDz +XgDzYQDzZADzZwDzagDzbQDzcADzcwDzdgDzeQDzfADzfwDzggDzhQDziADziwDzjQDzkADzkwDzlgDz +mQDznADznwDzogDzpQDzqADzqwDzrQDzsADzswDztgDzuQDzuwDzvgDzwQDzxADzxgDzyQDzzADzzwDz 0gDz1QDz2ADz4QDz4wD3GwD3HgD3IQD3JAD3JwD3KgD3LQD3MAD3MwD3NgD3OQD3PAD3PwD3QgD3RQD3 SAD3SwD3TgD3UQD3VAD3VwD3WgD3XQD3YAD3YwD3ZgD3aQD3bAD3bwD3cgD3dQD3eAD3ewD3fgD3gQD3 hAD3hwD3igD3jQD3kAD3kwD3lgD3mQD3nAD3nwD3ogD3pQD3qAD3qwD3rgD3sQD3tAD3twD3ugD3vQD3 @@ -10313,26 +10316,26 @@ CAD7CwD7DgD7EQD7FAD7FwD7GgD7HQD7IAD7IwD7JgD7KQD7LAD7LwD7MgD7NQD7OAD7OwD7PgD7QQD7 RAD7RwD7SgD7TQD7UAD7UwD7VgD7WQD7XAD7XwD7YgD7ZQD7aAD7awD7bgD7cQD7dAD7dwD7egD7fQD7 gAD7gwD7hgD7iQD7jAD7jwD7kgD7lQD7mAD7mwD7ngD7oQD7pAD7pwD7qgD7rQD7sAD7swD7tgD7uQD7 vAD7vwD7wgD7xQD7yAD7ywD7zgD70QD71AD71wD72gD73QD74AD74wD75gD76QD77AD77wD78gD79QD7 -+AD7+wD7/gD8AQD8BAD8BgD8CAD8CwD8DQD8EAD8EwD8FgD8GAD8GgD8HAD8HgD8IQD8JAD8JwD8KQD8 -LAD8LwD8MgD8NQD8OAD8OwD8PgD8QQD8RAD8RwD8SgD8TQD8TwD8UgD8VQD8WAD8WgD8XQD8YAD8YgD8 -ZQD8ZwD8agD8bQD8cAD8cwD8dgD8eQD8fAD8fgD8gAD8ggD8hAD8hwD8igD8jQD8kAD8kwD8lgD8mAD8 -mgD8nQD8oAD8owD8pgD8qAD8qwD8rgD8sQD8swD8tgD8uQD8vAD8vwD8wgD8xQD8xwD8ygD8zQD80AD8 -0wD81gD82QD83AD83wD84gD85QD86AD86gD87AD87wD88gD89QD8+AD8+wD8/gD9AQD9BAD9BwD9CQD9 -CwD9DQD9EAD9EwD9FgD9GQD9GwD9HgD9IQD9JAD9JgD9KAD9KwD9LgD9MQD9NAD9NwD9OgD9PQD9QAD9 -QwD9RgD9SQD9TAD9TwD9UgD9VQD9WAD9WwD9ZAD9ZwD9agD9bQD9cAD9cwD9dQD9eAD9ewD9fQD9gAD9 -gwD9hgD9iQD9jAD9jwD9kgD9lQD9lwD9mQD9nAD9ngD9oQD9pAD9pwD9qQD9rAD9rwD9sQD9tAD9twD9 -ugD9vQD9wAD9wwD9xQD9yAD9ywD9zgD90QD91AD91wD92gD93QD94AD94wD95QD96AD96wD97gD98QD9 -9AD99wD9+gD9/QD+AAD+AwD+BgD+CQD+DAD+DgD+EQD+FAD+FwD+GgD+HQD+IAD+IwD+JQD+KAD+KwD+ -LgD+MQD+NAD+NwD+OgD+PAD+PwD+QgD+RQD+SAD+SgD+TAD+TgD+UQD+VAD+VwD+WgD+XQD+YAD+YgD+ -ZQD+aAD+awD+bgD+cQD+dAD+dwD+egD+fQD+gAD+gwD+hgD+iQD+jAD+jwD+kgD+lQD+mAD+mwD+ngD+ -oQD+pAD+pwD+qgD+rQD+sAD+swD+tgD+uQD+vAD+vwD+wgD+xAD+xwD+ygD+zQD+0AD+0wD+1gD+2QD+ -2wD+3gD+4QD+5AD+5wD+6gD+7QD+8AD+8wD+9gD++QD++wD+/gD/AAD/AwD/BgD/CAD/CwD/DgD/EQD/ -FAD/FwD/GgD/HQD/IAD/IwD/JgD/KQD/LAD/LwD/MgD/NQD/OAD/OwD/PgD/QQD/RAD/RgD/SQD/TAD/ -TwD/UgD/VQD/VwD/WgD/XQD/YAD/YwD/ZQD/aAD/awD/bgD/cQD/dAD/dwD/egD/fQD/gAD/gwD/hQD/ -iAD/iwD/jgD/kQD/kwD/lgD/mQD/nAD/ngD/oQD/pAD/pwD/qgD/rQD/sAD/swD/tgD/uQD/vAD/vwD/ -wgD/xQD/yAD/ygD/zQD/0AD/0wD/1gD/2QD/3AD/3wD/4gD/5AD/5wD/6gD/7QD/8AD/8wD/9gD/+QD/ -+wD//gEAAQEAAwEABgEACQEADAEADwEAEgEAFQEAGAEAGgEAHQEAIAEAIgEAJQEAKAEAKwEALgEAMQEA -NAEANwEAOgEAPAEAPwEAQgEARQEASAEASwEATgEAUQEAVAEAVwEAWQEAXAEAXwEAYgEAZAEAZwEAcAEA ++AD7+wD7/gD8AQD8AwD8BgD8CQD8DAD8DwD8EQD8FAD8FgD8GQD8GwD8HgD8IQD8JAD8JgD8KQD8LAD8 +LwD8MgD8NQD8OAD8OwD8PgD8QQD8RAD8RwD8SQD8TAD8TwD8UgD8VQD8VwD8WgD8XQD8YAD8YwD8ZgD8 +aQD8bAD8bwD8cgD8dQD8dwD8eQD8ewD8fgD8gQD8hAD8hgD8iQD8jAD8jwD8kgD8lQD8mAD8mwD8nQD8 +nwD8oQD8pAD8pwD8qQD8rAD8rwD8sQD8tAD8twD8ugD8vAD8vwD8wgD8xQD8yAD8ywD8zgD80QD80wD8 +1gD82AD82wD83gD84QD85AD85wD86gD87QD88AD88wD89gD8+QD8/AD8/wD9AgD9BAD9BgD9CQD9DAD9 +DwD9EgD9FQD9GAD9GwD9HQD9IAD9IwD9JgD9KAD9KgD9LAD9LwD9MgD9NAD9NwD9OgD9PQD9PwD9QQD9 +RAD9RwD9SgD9TQD9UAD9UwD9VgD9WQD9XAD9XwD9YgD9ZQD9aAD9awD9bgD9cQD9cwD9dgD9eQD9ggD9 +hQD9iAD9iwD9jgD9kQD9lAD9lgD9mAD9mwD9ngD9oQD9pAD9pwD9qgD9rQD9sAD9swD9tQD9twD9ugD9 +vAD9vwD9wgD9xQD9yAD9ywD9zgD90AD90wD91gD92AD92wD93gD94QD95AD95wD96gD97QD98AD98wD9 +9gD9+QD9/AD9/wD+AgD+BQD+CAD+CwD+DgD+EQD+EwD+FgD+GQD+HAD+HgD+IQD+JAD+JwD+KgD+LQD+ +MAD+MwD+NgD+OQD+PAD+PwD+QgD+RQD+SAD+SwD+TgD+UQD+UwD+VgD+WAD+WgD+XQD+YAD+YwD+ZgD+ +aAD+awD+bgD+cQD+cwD+dgD+eQD+fAD+fgD+gQD+hAD+hwD+igD+jQD+kAD+kwD+lgD+mQD+nAD+nwD+ +ogD+pQD+qAD+qwD+rgD+sQD+tAD+twD+ugD+vQD+wAD+wwD+xgD+yQD+zAD+zwD+0gD+1QD+1wD+2gD+ +3QD+4AD+4gD+5QD+6AD+6wD+7gD+8QD+9AD+9wD++gD+/QD/AAD/AwD/BgD/CAD/CwD/DQD/EAD/EwD/ +FQD/GAD/GwD/HgD/IQD/JAD/JwD/KgD/LAD/LwD/MgD/NQD/OAD/OwD/PgD/QQD/RAD/RwD/SgD/TAD/ +TwD/UgD/VQD/WAD/WwD/XQD/YAD/YwD/ZgD/aQD/bAD/bwD/cQD/dAD/dwD/egD/fQD/gAD/gwD/hgD/ +iQD/jAD/jwD/kgD/lAD/lwD/mgD/nQD/oAD/owD/pgD/qQD/qwD/rgD/sQD/tAD/twD/uQD/vAD/vwD/ +wgD/xQD/yAD/ywD/zgD/0QD/1AD/1wD/2gD/3QD/4AD/4wD/5QD/6AD/6wD/7gD/8QD/9AD/9wD/+gD/ +/QD//wEAAgEABQEACAEACgEADQEAEAEAEgEAFQEAGAEAGwEAHgEAIQEAJAEAJgEAKQEAKwEALgEAMQEA +NAEANwEAOgEAPQEAPwEAQgEARQEASAEASwEATgEAUQEAVAEAVgEAWQEAXAEAXwEAYQEAZAEAZwEAcAEA cgEAcwEAfAEAfgEAfwEAiAEAigEAiwEAlAEAmQAAAAAAAAMCAAAAAAAAHaQAAAAAAAAAAAAAAAAAAQCo A diff --git a/Spotlight/SpotlightWindowController.m b/Spotlight/SpotlightWindowController.m index eab284a38..349e4c6a7 100644 --- a/Spotlight/SpotlightWindowController.m +++ b/Spotlight/SpotlightWindowController.m @@ -27,17 +27,6 @@ static NSPredicate * musicOnlyPredicate = nil; { musicOnlyPredicate = [[NSPredicate predicateWithFormat: @"kMDItemContentTypeTree==\'public.audio\'"] retain]; - - // Set the home directory as the default search directory - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - NSString * homeDir = @"~"; - homeDir = [homeDir stringByExpandingTildeInPath]; - homeDir = [[NSURL fileURLWithPath:homeDir isDirectory:YES] absoluteString]; - NSDictionary *searchDefault = - [NSDictionary dictionaryWithObject:homeDir - forKey:@"spotlightSearchPath"]; - [defaults registerDefaults:searchDefault]; - // Register value transformers NSValueTransformer *pausingQueryTransformer = [[[PausingQueryTransformer alloc]init]autorelease]; @@ -55,6 +44,19 @@ static NSPredicate * musicOnlyPredicate = nil; [NSMetadataQuery exposeBinding:@"searchScopes"]; } +- (void)registerDefaults +{ + // Set the home directory as the default search directory + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; + NSString * homeDir = @"~"; + homeDir = [homeDir stringByExpandingTildeInPath]; + homeDir = [[NSURL fileURLWithPath:homeDir isDirectory:YES] absoluteString]; + NSDictionary *searchDefault = + [NSDictionary dictionaryWithObject:homeDir + forKey:@"spotlightSearchPath"]; + [defaults registerDefaults:searchDefault]; +} + - (id)init { if (self = [super initWithWindowNibName:@"SpotlightPanel"]) { @@ -83,6 +85,8 @@ static NSPredicate * musicOnlyPredicate = nil; - (void)awakeFromNib { + [self registerDefaults]; + // We want to bind the query's search scope to the user default that is // set from the NSPathControl. NSDictionary *bindOptions =