Index: trunk/ChameleonPrefPane/Sources/PartitionInfoElement.mm
===================================================================
--- trunk/ChameleonPrefPane/Sources/PartitionInfoElement.mm (revision 465)
+++ trunk/ChameleonPrefPane/Sources/PartitionInfoElement.mm (revision 466)
@@ -74,7 +74,7 @@
withPath: path];
NSString *cmdWindows = (cmdDarwin==nil) ? @"" :
[self cmdInfoForFile: @"boot.ini"
- withFilter: @"s!^multi.+WINDOWS=\\\"(.+)(\\\".+$)!\\1!p"
+ withFilter: @"s!^multi.+WIN.+=\\\"(.+)(\\\".+$)!\\1!p"
withPath: path];
NSString * result = [[cmdCham stringByAppendingString: cmdDarwin]
Index: trunk/ChameleonPrefPane/Info.plist
===================================================================
--- trunk/ChameleonPrefPane/Info.plist (revision 465)
+++ trunk/ChameleonPrefPane/Info.plist (revision 466)
@@ -19,11 +19,11 @@
CFBundlePackageType
BNDL
CFBundleShortVersionString
- 2.1
+ 2.2
CFBundleSignature
????
CFBundleVersion
- 2.1.0
+ 2.2.0
NSMainNibFile
Chameleon
NSPrefPaneIconLabel
Index: trunk/ChameleonPrefPane/French.lproj/Chameleon.xib
===================================================================
--- trunk/ChameleonPrefPane/French.lproj/Chameleon.xib (revision 465)
+++ trunk/ChameleonPrefPane/French.lproj/Chameleon.xib (revision 466)
@@ -941,7 +941,7 @@
2
- {{44, 185}, {511, 341.85546875}}
+ {{14, 42}, {511, 341}}
2
@@ -971,7 +971,7 @@
- {{-32, -143}, {605, 568}}
+ {541, 408}
2
@@ -1254,7 +1254,7 @@
2
- {{14, 250}, {511, 130}}
+ {{14, 254}, {511, 130}}
YES
@@ -1534,7 +1534,7 @@
268
{{403, 25}, {92, 18}}
-
+
2
YES
@@ -1664,117 +1664,6 @@
274
YES
-
-
- 36
-
- YES
-
-
- 274
-
- YES
-
-
- 12
- {{16, 13}, {144, 23}}
-
-
- 2
- YES
-
- 67239424
- 0
- Rescan
-
-
- 1211912703
- 2
-
-
-
-
- 200
- 25
-
-
-
-
- 12
- {{329, 13}, {174, 23}}
-
-
- 2
- YES
-
- 67239424
- 0
- Scan Single Drive
-
-
- 1211912703
- 2
-
-
-
-
- 200
- 25
-
-
-
-
- 12
- {{164, 13}, {161, 23}}
-
-
- 2
- YES
-
- 67239424
- 0
- Rescan Prompt
-
-
- 1211912703
- 2
-
-
-
-
- 200
- 25
-
-
-
- {{1, 1}, {509, 52}}
-
-
- 2
-
-
- {{14, 69}, {511, 68}}
-
-
- 2
- {0, 0}
-
- 67239424
- 0
- CDROM
-
-
-
- 3
- MCAwLjgwMDAwMDAxMTkAA
-
-
-
- 1
- 0
- 2
- NO
-
12
@@ -1788,7 +1677,7 @@
12
- {{16, 142}, {144, 23}}
+ {{16, 148}, {144, 23}}
2
@@ -1812,7 +1701,7 @@
12
- {{329, 88}, {175, 23}}
+ {{329, 94}, {175, 23}}
2
@@ -1836,7 +1725,7 @@
12
- {{329, 144}, {175, 23}}
+ {{329, 150}, {175, 23}}
2
@@ -1860,7 +1749,7 @@
12
- {{164, 114}, {164, 23}}
+ {{164, 120}, {164, 23}}
2
@@ -1884,7 +1773,7 @@
12
- {{329, 114}, {175, 23}}
+ {{329, 120}, {175, 23}}
2
@@ -1908,7 +1797,7 @@
12
- {{16, 89}, {144, 23}}
+ {{16, 95}, {144, 23}}
2
@@ -1932,7 +1821,7 @@
12
- {{16, 60}, {144, 23}}
+ {{16, 66}, {144, 23}}
2
@@ -1956,7 +1845,7 @@
12
- {{329, 63}, {161, 23}}
+ {{329, 69}, {161, 23}}
2
@@ -1980,7 +1869,7 @@
12
- {{16, 114}, {144, 23}}
+ {{16, 120}, {144, 23}}
2
@@ -2004,7 +1893,7 @@
268
- {{164, 147}, {161, 18}}
+ {{164, 153}, {161, 18}}
2
@@ -2028,7 +1917,7 @@
12
- {{164, 60}, {164, 23}}
+ {{164, 66}, {164, 23}}
2
@@ -2052,7 +1941,7 @@
268
- {{166, 88}, {46, 26}}
+ {{166, 94}, {46, 26}}
2
@@ -2147,7 +2036,7 @@
12
- {{16, 32}, {144, 23}}
+ {{16, 38}, {144, 23}}
2
@@ -2171,7 +2060,7 @@
12
- {{16, 6}, {144, 23}}
+ {{16, 12}, {144, 23}}
2
@@ -2195,7 +2084,7 @@
268
- {{166, 32}, {134, 26}}
+ {{166, 38}, {134, 26}}
2
@@ -2280,7 +2169,7 @@
268
- {{166, 6}, {134, 26}}
+ {{166, 12}, {134, 26}}
2
@@ -2363,13 +2252,13 @@
- {{1, 1}, {509, 184}}
+ {{1, 1}, {509, 190}}
2
- {{14, 173}, {511, 200}}
+ {{14, 178}, {511, 206}}
2
@@ -2391,6 +2280,117 @@
2
NO
+
+
+ 36
+
+ YES
+
+
+ 274
+
+ YES
+
+
+ 12
+ {{16, 13}, {144, 23}}
+
+
+ 2
+ YES
+
+ 67239424
+ 0
+ Rescan
+
+
+ 1211912703
+ 2
+
+
+
+
+ 200
+ 25
+
+
+
+
+ 12
+ {{329, 13}, {174, 23}}
+
+
+ 2
+ YES
+
+ 67239424
+ 0
+ Scan Single Drive
+
+
+ 1211912703
+ 2
+
+
+
+
+ 200
+ 25
+
+
+
+
+ 12
+ {{164, 13}, {161, 23}}
+
+
+ 2
+ YES
+
+ 67239424
+ 0
+ Rescan Prompt
+
+
+ 1211912703
+ 2
+
+
+
+
+ 200
+ 25
+
+
+
+ {{1, 1}, {509, 52}}
+
+
+ 2
+
+
+ {{14, 97}, {511, 68}}
+
+
+ 2
+ {0, 0}
+
+ 67239424
+ 0
+ CDROM
+
+
+
+ 3
+ MCAwLjgwMDAwMDAxMTkAA
+
+
+
+ 1
+ 0
+ 2
+ NO
+
{{1, 1}, {539, 403}}
@@ -2464,7 +2464,7 @@
12
- {{155, 17}, {248, 23}}
+ {{155, 18}, {248, 23}}
2
@@ -2488,7 +2488,7 @@
12
- {{16, 86}, {135, 23}}
+ {{16, 87}, {135, 23}}
2
@@ -2512,7 +2512,7 @@
268
- {{361, 86}, {134, 23}}
+ {{361, 87}, {134, 23}}
2
@@ -2536,7 +2536,7 @@
268
- {{361, 51}, {134, 23}}
+ {{361, 52}, {134, 23}}
2
@@ -2560,7 +2560,7 @@
12
- {{16, 17}, {141, 23}}
+ {{16, 18}, {141, 23}}
2
@@ -2584,7 +2584,7 @@
268
- {{157, 83}, {181, 26}}
+ {{157, 84}, {181, 26}}
2
@@ -2673,7 +2673,7 @@
268
- {{16, 53}, {141, 18}}
+ {{16, 54}, {141, 18}}
2
@@ -2697,7 +2697,7 @@
268
- {{155, 53}, {202, 18}}
+ {{155, 54}, {202, 18}}
2
@@ -2719,13 +2719,13 @@
- {{1, 1}, {509, 121}}
+ {{1, 1}, {509, 122}}
2
- {{14, 250}, {511, 137}}
+ {{14, 246}, {511, 138}}
2
@@ -2836,7 +2836,7 @@
2
- {{14, 153}, {511, 60}}
+ {{14, 170}, {511, 60}}
2
@@ -2921,7 +2921,7 @@
268
{{361, 12}, {138, 23}}
-
+
2
YES
@@ -3029,7 +3029,7 @@
2
- {{14, 53}, {511, 59}}
+ {{14, 96}, {511, 59}}
2
@@ -4004,7 +4004,7 @@
2
- {{14, 125}, {511, 266}}
+ {{14, 118}, {511, 266}}
2
@@ -4113,7 +4113,7 @@
268
{{163, 18}, {201, 22}}
-
+
2
YES
@@ -4408,8 +4408,8 @@
- {{1, 1}, {462, 264}}
- {{0, 333}, {462, 264}}
+ {{1, 1}, {477, 264}}
+ {{0, 333}, {477, 264}}
2
@@ -4422,7 +4422,7 @@
256
{{463, 1}, {15, 264}}
-
+
YES
_doScroller:
@@ -4458,7 +4458,7 @@
2
- {{14, 21}, {511, 364}}
+ {{14, 20}, {511, 364}}
2
@@ -4540,42 +4540,6 @@
274
YES
-
-
- 12
-
- YES
-
-
- 274
- {{1, 1}, {509, 204}}
-
-
- 2
-
-
- {{14, 47}, {511, 220}}
-
-
- 2
- {0, 0}
-
- 67239424
- 0
- IORegistry
-
-
-
- 3
- MCAwLjgwMDAwMDAxAA
-
-
-
- 1
- 0
- 2
- NO
-
12
@@ -4727,7 +4691,7 @@
2
- {{14, 277}, {511, 103}}
+ {{14, 280}, {511, 103}}
2
@@ -4749,6 +4713,42 @@
2
NO
+
+
+ 12
+
+ YES
+
+
+ 274
+ {{1, 1}, {509, 204}}
+
+
+ 2
+
+
+ {{14, 50}, {511, 220}}
+
+
+ 2
+ {0, 0}
+
+ 67239424
+ 0
+ IORegistry
+
+
+
+ 3
+ MCAwLjgwMDAwMDAxAA
+
+
+
+ 1
+ 0
+ 2
+ NO
+
268
@@ -4798,7 +4798,7 @@
268
{{355, 13}, {168, 25}}
-
+
2
YES
@@ -4875,10 +4875,44 @@
274
YES
+
+
+ 256
+
+ YES
+
+ YES
+ Apple PDF pasteboard type
+ Apple PICT pasteboard type
+ Apple PNG pasteboard type
+ NSFilenamesPboardType
+ NeXT Encapsulated PostScript v1.2 pasteboard type
+ NeXT TIFF v4.0 pasteboard type
+
+
+ {{138, 350}, {280, 45}}
+
+
+ 2
+ YES
+
+ 130560
+ 33554432
+
+ NSImage
+ name
+
+ 0
+ 0
+ 0
+ YES
+
+ YES
+
264
- {{14, 337}, {509, 17}}
+ {{18, 330}, {509, 17}}
2
@@ -4901,10 +4935,44 @@
+
+
+ 256
+
+ YES
+
+ YES
+ Apple PDF pasteboard type
+ Apple PICT pasteboard type
+ Apple PNG pasteboard type
+ NSFilenamesPboardType
+ NeXT Encapsulated PostScript v1.2 pasteboard type
+ NeXT TIFF v4.0 pasteboard type
+
+
+ {{217, 222}, {100, 100}}
+
+
+ 2
+ YES
+
+ 130560
+ 33554432
+
+ NSImage
+ cham
+
+ 0
+ 0
+ 0
+ YES
+
+ YES
+
268
- {{62, 37}, {411, 231}}
+ {{62, 25}, {411, 231}}
@@ -4937,44 +5005,10 @@
-
-
- 256
-
- YES
-
- YES
- Apple PDF pasteboard type
- Apple PICT pasteboard type
- Apple PNG pasteboard type
- NSFilenamesPboardType
- NeXT Encapsulated PostScript v1.2 pasteboard type
- NeXT TIFF v4.0 pasteboard type
-
-
- {{217, 240}, {100, 100}}
-
-
- 2
- YES
-
- 130560
- 33554432
-
- NSImage
- cham
-
- 0
- 0
- 0
- YES
-
- YES
-
{{1, 1}, {539, 403}}
-
+
2
@@ -5005,40 +5039,6 @@
MC42OTcwODAyOTIAA
-
-
- 256
-
- YES
-
- YES
- Apple PDF pasteboard type
- Apple PICT pasteboard type
- Apple PNG pasteboard type
- NSFilenamesPboardType
- NeXT Encapsulated PostScript v1.2 pasteboard type
- NeXT TIFF v4.0 pasteboard type
-
-
- {{141, 358}, {262, 45}}
-
-
- 2
- YES
-
- 130560
- 33554432
-
- NSImage
- name
-
- 0
- 0
- 0
- YES
-
- YES
-
{541, 405}
@@ -6973,10 +6973,10 @@
YES
-
+
@@ -7157,10 +7157,10 @@
YES
+
-
@@ -7262,9 +7262,9 @@
YES
-
+
@@ -7283,7 +7283,6 @@
YES
-
@@ -7294,26 +7293,13 @@
YES
+
+
-
- 918
-
-
- YES
-
-
-
-
-
- 919
-
-
-
-
284
@@ -9118,6 +9104,20 @@
+
+ 918
+
+
+ YES
+
+
+
+
+
+ 919
+
+
+
Index: trunk/ChameleonPrefPane/Spanish.lproj/Chameleon.xib
===================================================================
--- trunk/ChameleonPrefPane/Spanish.lproj/Chameleon.xib (revision 465)
+++ trunk/ChameleonPrefPane/Spanish.lproj/Chameleon.xib (revision 466)
@@ -941,7 +941,7 @@
2
- {{44, 185}, {511, 341.85546875}}
+ {{14, 42}, {511, 341}}
2
@@ -971,7 +971,7 @@
268
- {{47, 148}, {104, 25}}
+ {{17, 8}, {158, 25}}
2
@@ -993,7 +993,7 @@
268
- {{159, 148}, {104, 25}}
+ {{190, 8}, {158, 25}}
2
@@ -1015,9 +1015,9 @@
268
- {{394, 148}, {158, 25}}
+ {{364, 8}, {158, 25}}
-
+
2
YES
@@ -1035,13 +1035,13 @@
- {{1, 1}, {603, 566}}
+ {{1, 1}, {539, 406}}
2
- {{-32, -143}, {605, 568}}
+ {541, 408}
2
@@ -1254,7 +1254,7 @@
2
- {{14, 250}, {511, 130}}
+ {{14, 254}, {511, 130}}
YES
@@ -1534,7 +1534,7 @@
268
{{403, 25}, {92, 18}}
-
+
2
YES
@@ -1664,117 +1664,6 @@
274
YES
-
-
- 36
-
- YES
-
-
- 274
-
- YES
-
-
- 12
- {{16, 13}, {144, 23}}
-
-
- 2
- YES
-
- 67239424
- 0
- Rescan
-
-
- 1211912703
- 2
-
-
-
-
- 200
- 25
-
-
-
-
- 12
- {{329, 13}, {174, 23}}
-
-
- 2
- YES
-
- 67239424
- 0
- Scan Single Drive
-
-
- 1211912703
- 2
-
-
-
-
- 200
- 25
-
-
-
-
- 12
- {{164, 13}, {161, 23}}
-
-
- 2
- YES
-
- 67239424
- 0
- Rescan Prompt
-
-
- 1211912703
- 2
-
-
-
-
- 200
- 25
-
-
-
- {{1, 1}, {509, 52}}
-
-
- 2
-
-
- {{14, 69}, {511, 68}}
-
-
- 2
- {0, 0}
-
- 67239424
- 0
- CD-ROM
-
-
-
- 3
- MCAwLjgwMDAwMDAxMTkAA
-
-
-
- 1
- 0
- 2
- NO
-
12
@@ -1788,7 +1677,7 @@
12
- {{16, 142}, {144, 23}}
+ {{16, 148}, {144, 23}}
2
@@ -1812,7 +1701,7 @@
12
- {{329, 88}, {175, 23}}
+ {{329, 94}, {175, 23}}
2
@@ -1836,7 +1725,7 @@
12
- {{329, 144}, {175, 23}}
+ {{329, 150}, {175, 23}}
2
@@ -1860,7 +1749,7 @@
12
- {{164, 114}, {164, 23}}
+ {{164, 120}, {164, 23}}
2
@@ -1884,7 +1773,7 @@
12
- {{329, 114}, {175, 23}}
+ {{329, 120}, {175, 23}}
2
@@ -1908,7 +1797,7 @@
12
- {{16, 89}, {144, 23}}
+ {{16, 95}, {144, 23}}
2
@@ -1932,7 +1821,7 @@
12
- {{16, 60}, {144, 23}}
+ {{16, 66}, {144, 23}}
2
@@ -1956,7 +1845,7 @@
12
- {{329, 63}, {161, 23}}
+ {{329, 69}, {161, 23}}
2
@@ -1980,7 +1869,7 @@
12
- {{16, 114}, {144, 23}}
+ {{16, 120}, {144, 23}}
2
@@ -2004,7 +1893,7 @@
268
- {{164, 147}, {161, 18}}
+ {{164, 153}, {161, 18}}
2
@@ -2028,7 +1917,7 @@
12
- {{164, 60}, {164, 23}}
+ {{164, 66}, {164, 23}}
2
@@ -2052,7 +1941,7 @@
268
- {{166, 88}, {46, 26}}
+ {{166, 94}, {46, 26}}
2
@@ -2147,7 +2036,7 @@
12
- {{16, 32}, {144, 23}}
+ {{16, 38}, {144, 23}}
2
@@ -2171,7 +2060,7 @@
12
- {{16, 6}, {144, 23}}
+ {{16, 12}, {144, 23}}
2
@@ -2195,7 +2084,7 @@
268
- {{166, 32}, {134, 26}}
+ {{166, 38}, {134, 26}}
2
@@ -2280,7 +2169,7 @@
268
- {{166, 6}, {134, 26}}
+ {{166, 12}, {134, 26}}
2
@@ -2363,13 +2252,13 @@
- {{1, 1}, {509, 184}}
+ {{1, 1}, {509, 190}}
2
- {{14, 173}, {511, 200}}
+ {{14, 178}, {511, 206}}
2
@@ -2391,6 +2280,117 @@
2
NO
+
+
+ 36
+
+ YES
+
+
+ 274
+
+ YES
+
+
+ 12
+ {{16, 13}, {144, 23}}
+
+
+ 2
+ YES
+
+ 67239424
+ 0
+ Rescan
+
+
+ 1211912703
+ 2
+
+
+
+
+ 200
+ 25
+
+
+
+
+ 12
+ {{329, 13}, {174, 23}}
+
+
+ 2
+ YES
+
+ 67239424
+ 0
+ Scan Single Drive
+
+
+ 1211912703
+ 2
+
+
+
+
+ 200
+ 25
+
+
+
+
+ 12
+ {{164, 13}, {161, 23}}
+
+
+ 2
+ YES
+
+ 67239424
+ 0
+ Rescan Prompt
+
+
+ 1211912703
+ 2
+
+
+
+
+ 200
+ 25
+
+
+
+ {{1, 1}, {509, 52}}
+
+
+ 2
+
+
+ {{14, 97}, {511, 68}}
+
+
+ 2
+ {0, 0}
+
+ 67239424
+ 0
+ CD-ROM
+
+
+
+ 3
+ MCAwLjgwMDAwMDAxMTkAA
+
+
+
+ 1
+ 0
+ 2
+ NO
+
{{1, 1}, {539, 403}}
@@ -2464,7 +2464,7 @@
12
- {{155, 17}, {248, 23}}
+ {{155, 18}, {248, 23}}
2
@@ -2488,7 +2488,7 @@
12
- {{16, 86}, {135, 23}}
+ {{16, 87}, {135, 23}}
2
@@ -2512,7 +2512,7 @@
268
- {{361, 86}, {134, 23}}
+ {{361, 87}, {134, 23}}
2
@@ -2536,7 +2536,7 @@
268
- {{361, 51}, {134, 23}}
+ {{361, 52}, {134, 23}}
2
@@ -2560,7 +2560,7 @@
12
- {{16, 17}, {141, 23}}
+ {{16, 18}, {141, 23}}
2
@@ -2584,7 +2584,7 @@
268
- {{157, 83}, {181, 26}}
+ {{157, 84}, {181, 26}}
2
@@ -2673,7 +2673,7 @@
268
- {{16, 53}, {141, 18}}
+ {{16, 54}, {141, 18}}
2
@@ -2697,7 +2697,7 @@
268
- {{155, 53}, {202, 18}}
+ {{155, 54}, {202, 18}}
2
@@ -2719,13 +2719,13 @@
- {{1, 1}, {509, 121}}
+ {{1, 1}, {509, 122}}
2
- {{14, 250}, {511, 137}}
+ {{14, 246}, {511, 138}}
2
@@ -2836,7 +2836,7 @@
2
- {{14, 153}, {511, 60}}
+ {{14, 170}, {511, 60}}
2
@@ -2921,7 +2921,7 @@
268
{{361, 12}, {138, 23}}
-
+
2
YES
@@ -3029,7 +3029,7 @@
2
- {{14, 53}, {511, 59}}
+ {{14, 96}, {511, 59}}
2
@@ -4006,7 +4006,7 @@
2
- {{14, 125}, {511, 266}}
+ {{14, 118}, {511, 266}}
2
@@ -4115,7 +4115,7 @@
268
{{163, 18}, {201, 22}}
-
+
2
YES
@@ -4410,8 +4410,8 @@
- {{1, 1}, {462, 264}}
- {{0, 333}, {462, 264}}
+ {{1, 1}, {477, 264}}
+ {{0, 333}, {477, 264}}
2
@@ -4424,7 +4424,7 @@
256
{{463, 1}, {15, 264}}
-
+
YES
_doScroller:
@@ -4460,7 +4460,7 @@
2
- {{14, 21}, {511, 364}}
+ {{14, 20}, {511, 364}}
2
@@ -4542,42 +4542,6 @@
274
YES
-
-
- 12
-
- YES
-
-
- 274
- {{1, 1}, {509, 204}}
-
-
- 2
-
-
- {{14, 47}, {511, 220}}
-
-
- 2
- {0, 0}
-
- 67239424
- 0
- IORegistry
-
-
-
- 3
- MCAwLjgwMDAwMDAxAA
-
-
-
- 1
- 0
- 2
- NO
-
12
@@ -4729,7 +4693,7 @@
2
- {{14, 277}, {511, 103}}
+ {{14, 280}, {511, 103}}
2
@@ -4751,6 +4715,42 @@
2
NO
+
+
+ 12
+
+ YES
+
+
+ 274
+ {{1, 1}, {509, 204}}
+
+
+ 2
+
+
+ {{14, 50}, {511, 220}}
+
+
+ 2
+ {0, 0}
+
+ 67239424
+ 0
+ IORegistry
+
+
+
+ 3
+ MCAwLjgwMDAwMDAxAA
+
+
+
+ 1
+ 0
+ 2
+ NO
+
268
@@ -4800,7 +4800,7 @@
268
{{355, 13}, {168, 25}}
-
+
2
YES
@@ -4877,10 +4877,44 @@
274
YES
+
+
+ 256
+
+ YES
+
+ YES
+ Apple PDF pasteboard type
+ Apple PICT pasteboard type
+ Apple PNG pasteboard type
+ NSFilenamesPboardType
+ NeXT Encapsulated PostScript v1.2 pasteboard type
+ NeXT TIFF v4.0 pasteboard type
+
+
+ {{138, 350}, {280, 45}}
+
+
+ 2
+ YES
+
+ 130560
+ 33554432
+
+ NSImage
+ name
+
+ 0
+ 0
+ 0
+ YES
+
+ YES
+
264
- {{14, 337}, {509, 17}}
+ {{18, 330}, {509, 17}}
2
@@ -4903,10 +4937,44 @@
+
+
+ 256
+
+ YES
+
+ YES
+ Apple PDF pasteboard type
+ Apple PICT pasteboard type
+ Apple PNG pasteboard type
+ NSFilenamesPboardType
+ NeXT Encapsulated PostScript v1.2 pasteboard type
+ NeXT TIFF v4.0 pasteboard type
+
+
+ {{217, 222}, {100, 100}}
+
+
+ 2
+ YES
+
+ 130560
+ 33554432
+
+ NSImage
+ cham
+
+ 0
+ 0
+ 0
+ YES
+
+ YES
+
268
- {{62, 37}, {411, 231}}
+ {{62, 25}, {411, 231}}
@@ -4939,44 +5007,10 @@
-
-
- 256
-
- YES
-
- YES
- Apple PDF pasteboard type
- Apple PICT pasteboard type
- Apple PNG pasteboard type
- NSFilenamesPboardType
- NeXT Encapsulated PostScript v1.2 pasteboard type
- NeXT TIFF v4.0 pasteboard type
-
-
- {{217, 240}, {100, 100}}
-
-
- 2
- YES
-
- 130560
- 33554432
-
- NSImage
- cham
-
- 0
- 0
- 0
- YES
-
- YES
-
{{1, 1}, {539, 403}}
-
+
2
@@ -5007,40 +5041,6 @@
MC42OTcwODAyOTIAA
-
-
- 256
-
- YES
-
- YES
- Apple PDF pasteboard type
- Apple PICT pasteboard type
- Apple PNG pasteboard type
- NSFilenamesPboardType
- NeXT Encapsulated PostScript v1.2 pasteboard type
- NeXT TIFF v4.0 pasteboard type
-
-
- {{141, 358}, {262, 45}}
-
-
- 2
- YES
-
- 130560
- 33554432
-
- NSImage
- name
-
- 0
- 0
- 0
- YES
-
- YES
-
{541, 405}
@@ -6975,10 +6975,10 @@
YES
-
+
@@ -7159,10 +7159,10 @@
YES
+
-
@@ -7264,9 +7264,9 @@
YES
-
+
@@ -7285,7 +7285,6 @@
YES
-
@@ -7296,26 +7295,13 @@
YES
+
+
-
- 918
-
-
- YES
-
-
-
-
-
- 919
-
-
-
-
284
@@ -9120,6 +9106,20 @@
+
+ 918
+
+
+ YES
+
+
+
+
+
+ 919
+
+
+
Index: trunk/ChameleonPrefPane/German.lproj/Chameleon.xib
===================================================================
--- trunk/ChameleonPrefPane/German.lproj/Chameleon.xib (revision 465)
+++ trunk/ChameleonPrefPane/German.lproj/Chameleon.xib (revision 466)
@@ -941,7 +941,7 @@
2
- {{44, 185}, {511, 341.85546875}}
+ {{14, 42}, {511, 341}}
2
@@ -971,7 +971,7 @@
268
- {{47, 148}, {104, 25}}
+ {{17, 8}, {158, 25}}
2
@@ -993,7 +993,7 @@
268
- {{159, 148}, {104, 25}}
+ {{190, 8}, {158, 25}}
2
@@ -1015,9 +1015,9 @@
268
- {{394, 148}, {158, 25}}
+ {{364, 8}, {158, 25}}
-
+
2
YES
@@ -1035,13 +1035,13 @@
- {{1, 1}, {603, 566}}
+ {{1, 1}, {539, 406}}
2
- {{-32, -143}, {605, 568}}
+ {541, 408}
2
@@ -1254,7 +1254,7 @@
2
- {{14, 250}, {511, 130}}
+ {{14, 254}, {511, 130}}
YES
@@ -1534,7 +1534,7 @@
268
{{403, 25}, {92, 18}}
-
+
2
YES
@@ -1664,117 +1664,6 @@
274
YES
-
-
- 36
-
- YES
-
-
- 274
-
- YES
-
-
- 12
- {{16, 13}, {144, 23}}
-
-
- 2
- YES
-
- 67239424
- 0
- Rescan
-
-
- 1211912703
- 2
-
-
-
-
- 200
- 25
-
-
-
-
- 12
- {{329, 13}, {174, 23}}
-
-
- 2
- YES
-
- 67239424
- 0
- Suche einzelnes Laufwerk
-
-
- 1211912703
- 2
-
-
-
-
- 200
- 25
-
-
-
-
- 12
- {{164, 13}, {161, 23}}
-
-
- 2
- YES
-
- 67239424
- 0
- Rescan Prompt
-
-
- 1211912703
- 2
-
-
-
-
- 200
- 25
-
-
-
- {{1, 1}, {509, 52}}
-
-
- 2
-
-
- {{14, 69}, {511, 68}}
-
-
- 2
- {0, 0}
-
- 67239424
- 0
- CDROM
-
-
-
- 3
- MCAwLjgwMDAwMDAxMTkAA
-
-
-
- 1
- 0
- 2
- NO
-
12
@@ -1788,7 +1677,7 @@
12
- {{16, 142}, {144, 23}}
+ {{16, 148}, {144, 23}}
2
@@ -1812,7 +1701,7 @@
12
- {{329, 88}, {175, 23}}
+ {{329, 94}, {175, 23}}
2
@@ -1836,7 +1725,7 @@
12
- {{329, 144}, {175, 23}}
+ {{329, 150}, {175, 23}}
2
@@ -1860,7 +1749,7 @@
12
- {{164, 114}, {164, 23}}
+ {{164, 120}, {164, 23}}
2
@@ -1884,7 +1773,7 @@
12
- {{329, 114}, {175, 23}}
+ {{329, 120}, {175, 23}}
2
@@ -1908,7 +1797,7 @@
12
- {{16, 89}, {144, 23}}
+ {{16, 95}, {144, 23}}
2
@@ -1932,7 +1821,7 @@
12
- {{16, 60}, {144, 23}}
+ {{16, 66}, {144, 23}}
2
@@ -1956,7 +1845,7 @@
12
- {{329, 63}, {161, 23}}
+ {{329, 69}, {161, 23}}
2
@@ -1980,7 +1869,7 @@
12
- {{16, 114}, {144, 23}}
+ {{16, 120}, {144, 23}}
2
@@ -2004,7 +1893,7 @@
268
- {{164, 147}, {161, 18}}
+ {{164, 153}, {161, 18}}
2
@@ -2028,7 +1917,7 @@
12
- {{164, 60}, {164, 23}}
+ {{164, 66}, {164, 23}}
2
@@ -2052,7 +1941,7 @@
268
- {{166, 88}, {46, 26}}
+ {{166, 94}, {46, 26}}
2
@@ -2147,7 +2036,7 @@
12
- {{16, 32}, {144, 23}}
+ {{16, 38}, {144, 23}}
2
@@ -2171,7 +2060,7 @@
12
- {{16, 6}, {144, 23}}
+ {{16, 12}, {144, 23}}
2
@@ -2195,7 +2084,7 @@
268
- {{166, 32}, {134, 26}}
+ {{166, 38}, {134, 26}}
2
@@ -2280,7 +2169,7 @@
268
- {{166, 6}, {134, 26}}
+ {{166, 12}, {134, 26}}
2
@@ -2363,13 +2252,13 @@
- {{1, 1}, {509, 184}}
+ {{1, 1}, {509, 190}}
2
- {{14, 173}, {511, 200}}
+ {{14, 178}, {511, 206}}
2
@@ -2391,6 +2280,117 @@
2
NO
+
+
+ 36
+
+ YES
+
+
+ 274
+
+ YES
+
+
+ 12
+ {{16, 13}, {144, 23}}
+
+
+ 2
+ YES
+
+ 67239424
+ 0
+ Rescan
+
+
+ 1211912703
+ 2
+
+
+
+
+ 200
+ 25
+
+
+
+
+ 12
+ {{329, 13}, {174, 23}}
+
+
+ 2
+ YES
+
+ 67239424
+ 0
+ Suche einzelnes Laufwerk
+
+
+ 1211912703
+ 2
+
+
+
+
+ 200
+ 25
+
+
+
+
+ 12
+ {{164, 13}, {161, 23}}
+
+
+ 2
+ YES
+
+ 67239424
+ 0
+ Rescan Prompt
+
+
+ 1211912703
+ 2
+
+
+
+
+ 200
+ 25
+
+
+
+ {{1, 1}, {509, 52}}
+
+
+ 2
+
+
+ {{14, 97}, {511, 68}}
+
+
+ 2
+ {0, 0}
+
+ 67239424
+ 0
+ CDROM
+
+
+
+ 3
+ MCAwLjgwMDAwMDAxMTkAA
+
+
+
+ 1
+ 0
+ 2
+ NO
+
{{1, 1}, {539, 403}}
@@ -2464,7 +2464,7 @@
12
- {{155, 17}, {248, 23}}
+ {{155, 18}, {248, 23}}
2
@@ -2488,7 +2488,7 @@
12
- {{16, 86}, {135, 23}}
+ {{16, 87}, {135, 23}}
2
@@ -2512,7 +2512,7 @@
268
- {{361, 86}, {134, 23}}
+ {{361, 87}, {134, 23}}
2
@@ -2536,7 +2536,7 @@
268
- {{361, 51}, {134, 23}}
+ {{361, 52}, {134, 23}}
2
@@ -2560,7 +2560,7 @@
12
- {{16, 17}, {141, 23}}
+ {{16, 18}, {141, 23}}
2
@@ -2584,7 +2584,7 @@
268
- {{157, 83}, {181, 26}}
+ {{157, 84}, {181, 26}}
2
@@ -2673,7 +2673,7 @@
268
- {{16, 53}, {141, 18}}
+ {{16, 54}, {141, 18}}
2
@@ -2697,7 +2697,7 @@
268
- {{155, 53}, {202, 18}}
+ {{155, 54}, {202, 18}}
2
@@ -2719,13 +2719,13 @@
- {{1, 1}, {509, 121}}
+ {{1, 1}, {509, 122}}
2
- {{14, 250}, {511, 137}}
+ {{14, 246}, {511, 138}}
2
@@ -2836,7 +2836,7 @@
2
- {{14, 153}, {511, 60}}
+ {{14, 170}, {511, 60}}
2
@@ -2921,7 +2921,7 @@
268
{{361, 12}, {138, 23}}
-
+
2
YES
@@ -3029,7 +3029,7 @@
2
- {{14, 53}, {511, 59}}
+ {{14, 96}, {511, 59}}
2
@@ -4004,7 +4004,7 @@
2
- {{14, 125}, {511, 266}}
+ {{14, 118}, {511, 266}}
2
@@ -4113,7 +4113,7 @@
268
{{163, 18}, {201, 22}}
-
+
2
YES
@@ -4408,8 +4408,8 @@
- {{1, 1}, {462, 264}}
- {{0, 333}, {462, 264}}
+ {{1, 1}, {477, 264}}
+ {{0, 333}, {477, 264}}
2
@@ -4422,7 +4422,7 @@
256
{{463, 1}, {15, 264}}
-
+
YES
_doScroller:
@@ -4458,7 +4458,7 @@
2
- {{14, 21}, {511, 364}}
+ {{14, 20}, {511, 364}}
2
@@ -4540,42 +4540,6 @@
274
YES
-
-
- 12
-
- YES
-
-
- 274
- {{1, 1}, {509, 204}}
-
-
- 2
-
-
- {{14, 47}, {511, 220}}
-
-
- 2
- {0, 0}
-
- 67239424
- 0
- IORegistry
-
-
-
- 3
- MCAwLjgwMDAwMDAxAA
-
-
-
- 1
- 0
- 2
- NO
-
12
@@ -4727,7 +4691,7 @@
2
- {{14, 277}, {511, 103}}
+ {{14, 280}, {511, 103}}
2
@@ -4749,6 +4713,42 @@
2
NO
+
+
+ 12
+
+ YES
+
+
+ 274
+ {{1, 1}, {509, 204}}
+
+
+ 2
+
+
+ {{14, 50}, {511, 220}}
+
+
+ 2
+ {0, 0}
+
+ 67239424
+ 0
+ IORegistry
+
+
+
+ 3
+ MCAwLjgwMDAwMDAxAA
+
+
+
+ 1
+ 0
+ 2
+ NO
+
268
@@ -4798,7 +4798,7 @@
268
{{355, 13}, {168, 25}}
-
+
2
YES
@@ -4875,10 +4875,44 @@
274
YES
+
+
+ 256
+
+ YES
+
+ YES
+ Apple PDF pasteboard type
+ Apple PICT pasteboard type
+ Apple PNG pasteboard type
+ NSFilenamesPboardType
+ NeXT Encapsulated PostScript v1.2 pasteboard type
+ NeXT TIFF v4.0 pasteboard type
+
+
+ {{138, 350}, {280, 45}}
+
+
+ 2
+ YES
+
+ 130560
+ 33554432
+
+ NSImage
+ name
+
+ 0
+ 0
+ 0
+ YES
+
+ YES
+
264
- {{14, 337}, {509, 17}}
+ {{18, 330}, {509, 17}}
2
@@ -4901,10 +4935,44 @@
+
+
+ 256
+
+ YES
+
+ YES
+ Apple PDF pasteboard type
+ Apple PICT pasteboard type
+ Apple PNG pasteboard type
+ NSFilenamesPboardType
+ NeXT Encapsulated PostScript v1.2 pasteboard type
+ NeXT TIFF v4.0 pasteboard type
+
+
+ {{217, 222}, {100, 100}}
+
+
+ 2
+ YES
+
+ 130560
+ 33554432
+
+ NSImage
+ cham
+
+ 0
+ 0
+ 0
+ YES
+
+ YES
+
268
- {{62, 37}, {411, 231}}
+ {{62, 25}, {411, 231}}
@@ -4937,44 +5005,10 @@
-
-
- 256
-
- YES
-
- YES
- Apple PDF pasteboard type
- Apple PICT pasteboard type
- Apple PNG pasteboard type
- NSFilenamesPboardType
- NeXT Encapsulated PostScript v1.2 pasteboard type
- NeXT TIFF v4.0 pasteboard type
-
-
- {{217, 240}, {100, 100}}
-
-
- 2
- YES
-
- 130560
- 33554432
-
- NSImage
- cham
-
- 0
- 0
- 0
- YES
-
- YES
-
{{1, 1}, {539, 403}}
-
+
2
@@ -5005,40 +5039,6 @@
MC42OTcwODAyOTIAA
-
-
- 256
-
- YES
-
- YES
- Apple PDF pasteboard type
- Apple PICT pasteboard type
- Apple PNG pasteboard type
- NSFilenamesPboardType
- NeXT Encapsulated PostScript v1.2 pasteboard type
- NeXT TIFF v4.0 pasteboard type
-
-
- {{141, 358}, {262, 45}}
-
-
- 2
- YES
-
- 130560
- 33554432
-
- NSImage
- name
-
- 0
- 0
- 0
- YES
-
- YES
-
{541, 405}
@@ -6973,10 +6973,10 @@
YES
-
+
@@ -7157,10 +7157,10 @@
YES
+
-
@@ -7262,9 +7262,9 @@
YES
-
+
@@ -7283,7 +7283,6 @@
YES
-
@@ -7294,26 +7293,13 @@
YES
+
+
-
- 918
-
-
- YES
-
-
-
-
-
- 919
-
-
-
-
284
@@ -9118,6 +9104,20 @@
+
+ 918
+
+
+ YES
+
+
+
+
+
+ 919
+
+
+
Index: trunk/ChameleonPrefPane/Italian.lproj/Chameleon.xib
===================================================================
--- trunk/ChameleonPrefPane/Italian.lproj/Chameleon.xib (revision 465)
+++ trunk/ChameleonPrefPane/Italian.lproj/Chameleon.xib (revision 466)
@@ -941,7 +941,7 @@
2
- {{44, 185}, {511, 341.85546875}}
+ {{14, 42}, {511, 341}}
2
@@ -971,7 +971,7 @@
268
- {{47, 148}, {104, 25}}
+ {{17, 8}, {158, 25}}
2
@@ -993,7 +993,7 @@
268
- {{159, 148}, {104, 25}}
+ {{190, 8}, {158, 25}}
2
@@ -1015,9 +1015,9 @@
268
- {{394, 148}, {158, 25}}
+ {{364, 8}, {158, 25}}
-
+
2
YES
@@ -1035,13 +1035,13 @@
- {{1, 1}, {603, 566}}
+ {{1, 1}, {539, 406}}
2
- {{-32, -143}, {605, 568}}
+ {541, 408}
2
@@ -1254,7 +1254,7 @@
2
- {{14, 250}, {511, 130}}
+ {{14, 254}, {511, 130}}
YES
@@ -1534,7 +1534,7 @@
268
{{403, 25}, {92, 18}}
-
+
2
YES
@@ -1664,117 +1664,6 @@
274
YES
-
-
- 36
-
- YES
-
-
- 274
-
- YES
-
-
- 12
- {{16, 13}, {144, 23}}
-
-
- 2
- YES
-
- 67239424
- 0
- Rescan
-
-
- 1211912703
- 2
-
-
-
-
- 200
- 25
-
-
-
-
- 12
- {{329, 13}, {174, 23}}
-
-
- 2
- YES
-
- 67239424
- 0
- Scansiona Singolo Drive
-
-
- 1211912703
- 2
-
-
-
-
- 200
- 25
-
-
-
-
- 12
- {{164, 13}, {161, 23}}
-
-
- 2
- YES
-
- 67239424
- 0
- Chiedi Rescan
-
-
- 1211912703
- 2
-
-
-
-
- 200
- 25
-
-
-
- {{1, 1}, {509, 52}}
-
-
- 2
-
-
- {{14, 69}, {511, 68}}
-
-
- 2
- {0, 0}
-
- 67239424
- 0
- CDROM
-
-
-
- 3
- MCAwLjgwMDAwMDAxMTkAA
-
-
-
- 1
- 0
- 2
- NO
-
12
@@ -1788,7 +1677,7 @@
12
- {{16, 142}, {144, 23}}
+ {{16, 148}, {144, 23}}
2
@@ -1812,7 +1701,7 @@
12
- {{329, 88}, {175, 23}}
+ {{329, 94}, {175, 23}}
2
@@ -1836,7 +1725,7 @@
12
- {{329, 144}, {175, 23}}
+ {{329, 150}, {175, 23}}
2
@@ -1860,7 +1749,7 @@
12
- {{164, 114}, {164, 23}}
+ {{164, 120}, {164, 23}}
2
@@ -1884,7 +1773,7 @@
12
- {{329, 114}, {175, 23}}
+ {{329, 120}, {175, 23}}
2
@@ -1908,7 +1797,7 @@
12
- {{16, 89}, {144, 23}}
+ {{16, 95}, {144, 23}}
2
@@ -1932,7 +1821,7 @@
12
- {{16, 60}, {144, 23}}
+ {{16, 66}, {144, 23}}
2
@@ -1956,7 +1845,7 @@
12
- {{329, 63}, {161, 23}}
+ {{329, 69}, {161, 23}}
2
@@ -1980,7 +1869,7 @@
12
- {{16, 114}, {144, 23}}
+ {{16, 120}, {144, 23}}
2
@@ -2004,7 +1893,7 @@
268
- {{164, 147}, {161, 18}}
+ {{164, 153}, {161, 18}}
2
@@ -2028,7 +1917,7 @@
12
- {{164, 60}, {164, 23}}
+ {{164, 66}, {164, 23}}
2
@@ -2052,7 +1941,7 @@
268
- {{166, 88}, {46, 26}}
+ {{166, 94}, {46, 26}}
2
@@ -2147,7 +2036,7 @@
12
- {{16, 32}, {144, 23}}
+ {{16, 38}, {144, 23}}
2
@@ -2171,7 +2060,7 @@
12
- {{16, 6}, {144, 23}}
+ {{16, 12}, {144, 23}}
2
@@ -2195,7 +2084,7 @@
268
- {{166, 32}, {134, 26}}
+ {{166, 38}, {134, 26}}
2
@@ -2280,7 +2169,7 @@
268
- {{166, 6}, {134, 26}}
+ {{166, 12}, {134, 26}}
2
@@ -2363,13 +2252,13 @@
- {{1, 1}, {509, 184}}
+ {{1, 1}, {509, 190}}
2
- {{14, 173}, {511, 200}}
+ {{14, 178}, {511, 206}}
2
@@ -2391,6 +2280,117 @@
2
NO
+
+
+ 36
+
+ YES
+
+
+ 274
+
+ YES
+
+
+ 12
+ {{16, 13}, {144, 23}}
+
+
+ 2
+ YES
+
+ 67239424
+ 0
+ Rescan
+
+
+ 1211912703
+ 2
+
+
+
+
+ 200
+ 25
+
+
+
+
+ 12
+ {{329, 13}, {174, 23}}
+
+
+ 2
+ YES
+
+ 67239424
+ 0
+ Scansiona Singolo Drive
+
+
+ 1211912703
+ 2
+
+
+
+
+ 200
+ 25
+
+
+
+
+ 12
+ {{164, 13}, {161, 23}}
+
+
+ 2
+ YES
+
+ 67239424
+ 0
+ Chiedi Rescan
+
+
+ 1211912703
+ 2
+
+
+
+
+ 200
+ 25
+
+
+
+ {{1, 1}, {509, 52}}
+
+
+ 2
+
+
+ {{14, 97}, {511, 68}}
+
+
+ 2
+ {0, 0}
+
+ 67239424
+ 0
+ CDROM
+
+
+
+ 3
+ MCAwLjgwMDAwMDAxMTkAA
+
+
+
+ 1
+ 0
+ 2
+ NO
+
{{1, 1}, {539, 403}}
@@ -2464,7 +2464,7 @@
12
- {{155, 17}, {248, 23}}
+ {{155, 18}, {248, 23}}
2
@@ -2488,7 +2488,7 @@
12
- {{16, 86}, {135, 23}}
+ {{16, 87}, {135, 23}}
2
@@ -2512,7 +2512,7 @@
268
- {{361, 86}, {134, 23}}
+ {{361, 87}, {134, 23}}
2
@@ -2536,7 +2536,7 @@
268
- {{361, 51}, {134, 23}}
+ {{361, 52}, {134, 23}}
2
@@ -2560,7 +2560,7 @@
12
- {{16, 17}, {141, 23}}
+ {{16, 18}, {141, 23}}
2
@@ -2584,7 +2584,7 @@
268
- {{157, 83}, {181, 26}}
+ {{157, 84}, {181, 26}}
2
@@ -2673,7 +2673,7 @@
268
- {{16, 53}, {141, 18}}
+ {{16, 54}, {141, 18}}
2
@@ -2697,7 +2697,7 @@
268
- {{155, 53}, {202, 18}}
+ {{155, 54}, {202, 18}}
2
@@ -2719,13 +2719,13 @@
- {{1, 1}, {509, 121}}
+ {{1, 1}, {509, 122}}
2
- {{14, 250}, {511, 137}}
+ {{14, 246}, {511, 138}}
2
@@ -2836,7 +2836,7 @@
2
- {{14, 153}, {511, 60}}
+ {{14, 170}, {511, 60}}
2
@@ -2921,7 +2921,7 @@
268
{{361, 12}, {138, 23}}
-
+
2
YES
@@ -3029,7 +3029,7 @@
2
- {{14, 53}, {511, 59}}
+ {{14, 96}, {511, 59}}
2
@@ -4004,7 +4004,7 @@
2
- {{14, 125}, {511, 266}}
+ {{14, 118}, {511, 266}}
2
@@ -4113,7 +4113,7 @@
268
{{163, 18}, {201, 22}}
-
+
2
YES
@@ -4408,8 +4408,8 @@
- {{1, 1}, {462, 264}}
- {{0, 333}, {462, 264}}
+ {{1, 1}, {477, 264}}
+ {{0, 333}, {477, 264}}
2
@@ -4422,7 +4422,7 @@
256
{{463, 1}, {15, 264}}
-
+
YES
_doScroller:
@@ -4458,7 +4458,7 @@
2
- {{14, 21}, {511, 364}}
+ {{14, 20}, {511, 364}}
2
@@ -4540,42 +4540,6 @@
274
YES
-
-
- 12
-
- YES
-
-
- 274
- {{1, 1}, {509, 204}}
-
-
- 2
-
-
- {{14, 47}, {511, 220}}
-
-
- 2
- {0, 0}
-
- 67239424
- 0
- IORegistry
-
-
-
- 3
- MCAwLjgwMDAwMDAxAA
-
-
-
- 1
- 0
- 2
- NO
-
12
@@ -4727,7 +4691,7 @@
2
- {{14, 277}, {511, 103}}
+ {{14, 280}, {511, 103}}
2
@@ -4749,6 +4713,42 @@
2
NO
+
+
+ 12
+
+ YES
+
+
+ 274
+ {{1, 1}, {509, 204}}
+
+
+ 2
+
+
+ {{14, 50}, {511, 220}}
+
+
+ 2
+ {0, 0}
+
+ 67239424
+ 0
+ IORegistry
+
+
+
+ 3
+ MCAwLjgwMDAwMDAxAA
+
+
+
+ 1
+ 0
+ 2
+ NO
+
268
@@ -4798,7 +4798,7 @@
268
{{355, 13}, {168, 25}}
-
+
2
YES
@@ -4875,10 +4875,44 @@
274
YES
+
+
+ 256
+
+ YES
+
+ YES
+ Apple PDF pasteboard type
+ Apple PICT pasteboard type
+ Apple PNG pasteboard type
+ NSFilenamesPboardType
+ NeXT Encapsulated PostScript v1.2 pasteboard type
+ NeXT TIFF v4.0 pasteboard type
+
+
+ {{138, 350}, {280, 45}}
+
+
+ 2
+ YES
+
+ 130560
+ 33554432
+
+ NSImage
+ name
+
+ 0
+ 0
+ 0
+ YES
+
+ YES
+
264
- {{14, 337}, {509, 17}}
+ {{18, 330}, {509, 17}}
2
@@ -4901,10 +4935,44 @@
+
+
+ 256
+
+ YES
+
+ YES
+ Apple PDF pasteboard type
+ Apple PICT pasteboard type
+ Apple PNG pasteboard type
+ NSFilenamesPboardType
+ NeXT Encapsulated PostScript v1.2 pasteboard type
+ NeXT TIFF v4.0 pasteboard type
+
+
+ {{217, 222}, {100, 100}}
+
+
+ 2
+ YES
+
+ 130560
+ 33554432
+
+ NSImage
+ cham
+
+ 0
+ 0
+ 0
+ YES
+
+ YES
+
268
- {{62, 37}, {411, 231}}
+ {{62, 25}, {411, 231}}
@@ -4937,44 +5005,10 @@
-
-
- 256
-
- YES
-
- YES
- Apple PDF pasteboard type
- Apple PICT pasteboard type
- Apple PNG pasteboard type
- NSFilenamesPboardType
- NeXT Encapsulated PostScript v1.2 pasteboard type
- NeXT TIFF v4.0 pasteboard type
-
-
- {{217, 240}, {100, 100}}
-
-
- 2
- YES
-
- 130560
- 33554432
-
- NSImage
- cham
-
- 0
- 0
- 0
- YES
-
- YES
-
{{1, 1}, {539, 403}}
-
+
2
@@ -5005,40 +5039,6 @@
MC42OTcwODAyOTIAA
-
-
- 256
-
- YES
-
- YES
- Apple PDF pasteboard type
- Apple PICT pasteboard type
- Apple PNG pasteboard type
- NSFilenamesPboardType
- NeXT Encapsulated PostScript v1.2 pasteboard type
- NeXT TIFF v4.0 pasteboard type
-
-
- {{141, 358}, {262, 45}}
-
-
- 2
- YES
-
- 130560
- 33554432
-
- NSImage
- name
-
- 0
- 0
- 0
- YES
-
- YES
-
{541, 405}
@@ -6973,10 +6973,10 @@
YES
-
+
@@ -7157,10 +7157,10 @@
YES
+
-
@@ -7262,9 +7262,9 @@
YES
-
+
@@ -7283,7 +7283,6 @@
YES
-
@@ -7294,26 +7293,13 @@
YES
+
+
-
- 918
-
-
- YES
-
-
-
-
-
- 919
-
-
-
-
284
@@ -9118,6 +9104,20 @@
+
+ 918
+
+
+ YES
+
+
+
+
+
+ 919
+
+
+
Index: trunk/ChameleonPrefPane/bin/OSX106/Chameleon.zip
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/ChameleonPrefPane/bin/version
===================================================================
--- trunk/ChameleonPrefPane/bin/version (revision 465)
+++ trunk/ChameleonPrefPane/bin/version (revision 466)
@@ -1 +1 @@
-Revision: 463
+Revision: 465
Index: trunk/ChameleonPrefPane/English.lproj/Chameleon.xib
===================================================================
--- trunk/ChameleonPrefPane/English.lproj/Chameleon.xib (revision 465)
+++ trunk/ChameleonPrefPane/English.lproj/Chameleon.xib (revision 466)
@@ -126,7 +126,7 @@
{126, 410}
-
+
2
YES
@@ -287,7 +287,7 @@
{{0, 29}, {126, 410}}
-
+
YES
YES
@@ -957,7 +957,7 @@
2
- {{44, 185}, {511, 341.85546875}}
+ {{14, 42}, {511, 341}}
@@ -988,7 +988,7 @@
268
- {{47, 148}, {104, 25}}
+ {{17, 8}, {158, 25}}
@@ -1011,7 +1011,7 @@
268
- {{159, 148}, {104, 25}}
+ {{190, 8}, {158, 25}}
@@ -1034,10 +1034,10 @@
268
- {{394, 148}, {158, 25}}
+ {{364, 8}, {158, 25}}
-
+
2
YES
@@ -1055,14 +1055,14 @@
- {{1, 1}, {603, 566}}
+ {{1, 1}, {539, 406}}
2
- {{-32, -143}, {605, 568}}
+ {541, 408}
@@ -1277,7 +1277,7 @@
2
- {{14, 250}, {511, 130}}
+ {{14, 254}, {511, 130}}
YES
@@ -1557,7 +1557,7 @@
268
{{403, 25}, {92, 18}}
-
+
2
YES
@@ -1687,117 +1687,6 @@
274
YES
-
-
- 36
-
- YES
-
-
- 274
-
- YES
-
-
- 12
- {{16, 13}, {144, 23}}
-
-
- 2
- YES
-
- 67239424
- 0
- Rescan
-
-
- 1211912703
- 2
-
-
-
-
- 200
- 25
-
-
-
-
- 12
- {{329, 13}, {174, 23}}
-
-
- 2
- YES
-
- 67239424
- 0
- Scan Single Drive
-
-
- 1211912703
- 2
-
-
-
-
- 200
- 25
-
-
-
-
- 12
- {{164, 13}, {161, 23}}
-
-
- 2
- YES
-
- 67239424
- 0
- Rescan Prompt
-
-
- 1211912703
- 2
-
-
-
-
- 200
- 25
-
-
-
- {{1, 1}, {509, 52}}
-
-
- 2
-
-
- {{14, 69}, {511, 68}}
-
-
- 2
- {0, 0}
-
- 67239424
- 0
- CDROM
-
-
-
- 3
- MCAwLjgwMDAwMDAxMTkAA
-
-
-
- 1
- 0
- 2
- NO
-
12
@@ -1811,7 +1700,7 @@
12
- {{16, 142}, {144, 23}}
+ {{16, 148}, {144, 23}}
2
@@ -1835,7 +1724,7 @@
12
- {{329, 88}, {175, 23}}
+ {{329, 94}, {175, 23}}
2
@@ -1859,7 +1748,7 @@
12
- {{329, 144}, {175, 23}}
+ {{329, 150}, {175, 23}}
2
@@ -1883,7 +1772,7 @@
12
- {{164, 114}, {164, 23}}
+ {{164, 120}, {164, 23}}
2
@@ -1907,7 +1796,7 @@
12
- {{329, 114}, {175, 23}}
+ {{329, 120}, {175, 23}}
2
@@ -1931,7 +1820,7 @@
12
- {{16, 89}, {144, 23}}
+ {{16, 95}, {144, 23}}
2
@@ -1955,7 +1844,7 @@
12
- {{16, 60}, {144, 23}}
+ {{16, 66}, {144, 23}}
2
@@ -1979,7 +1868,7 @@
12
- {{329, 63}, {161, 23}}
+ {{329, 69}, {161, 23}}
2
@@ -2003,7 +1892,7 @@
12
- {{16, 114}, {144, 23}}
+ {{16, 120}, {144, 23}}
2
@@ -2027,7 +1916,7 @@
268
- {{164, 147}, {161, 18}}
+ {{164, 153}, {161, 18}}
2
@@ -2051,7 +1940,7 @@
12
- {{164, 60}, {164, 23}}
+ {{164, 66}, {164, 23}}
2
@@ -2075,7 +1964,7 @@
268
- {{166, 88}, {46, 26}}
+ {{166, 94}, {46, 26}}
2
@@ -2170,7 +2059,7 @@
12
- {{16, 32}, {144, 23}}
+ {{16, 38}, {144, 23}}
2
@@ -2194,7 +2083,7 @@
12
- {{16, 6}, {144, 23}}
+ {{16, 12}, {144, 23}}
2
@@ -2218,7 +2107,7 @@
268
- {{166, 32}, {134, 26}}
+ {{166, 38}, {134, 26}}
2
@@ -2303,7 +2192,7 @@
268
- {{166, 6}, {134, 26}}
+ {{166, 12}, {134, 26}}
2
@@ -2386,13 +2275,13 @@
- {{1, 1}, {509, 184}}
+ {{1, 1}, {509, 190}}
2
- {{14, 173}, {511, 200}}
+ {{14, 178}, {511, 206}}
2
@@ -2414,6 +2303,117 @@
2
NO
+
+
+ 36
+
+ YES
+
+
+ 274
+
+ YES
+
+
+ 12
+ {{16, 13}, {144, 23}}
+
+
+ 2
+ YES
+
+ 67239424
+ 0
+ Rescan
+
+
+ 1211912703
+ 2
+
+
+
+
+ 200
+ 25
+
+
+
+
+ 12
+ {{329, 13}, {174, 23}}
+
+
+ 2
+ YES
+
+ 67239424
+ 0
+ Scan Single Drive
+
+
+ 1211912703
+ 2
+
+
+
+
+ 200
+ 25
+
+
+
+
+ 12
+ {{164, 13}, {161, 23}}
+
+
+ 2
+ YES
+
+ 67239424
+ 0
+ Rescan Prompt
+
+
+ 1211912703
+ 2
+
+
+
+
+ 200
+ 25
+
+
+
+ {{1, 1}, {509, 52}}
+
+
+ 2
+
+
+ {{14, 97}, {511, 68}}
+
+
+ 2
+ {0, 0}
+
+ 67239424
+ 0
+ CDROM
+
+
+
+ 3
+ MCAwLjgwMDAwMDAxMTkAA
+
+
+
+ 1
+ 0
+ 2
+ NO
+
{{1, 1}, {539, 403}}
@@ -2487,7 +2487,7 @@
12
- {{155, 17}, {248, 23}}
+ {{155, 18}, {248, 23}}
2
@@ -2511,7 +2511,7 @@
12
- {{16, 86}, {135, 23}}
+ {{16, 87}, {135, 23}}
2
@@ -2535,7 +2535,7 @@
268
- {{361, 86}, {134, 23}}
+ {{361, 87}, {134, 23}}
2
@@ -2559,7 +2559,7 @@
268
- {{361, 51}, {134, 23}}
+ {{361, 52}, {134, 23}}
2
@@ -2583,7 +2583,7 @@
12
- {{16, 17}, {141, 23}}
+ {{16, 18}, {141, 23}}
2
@@ -2607,7 +2607,7 @@
268
- {{157, 83}, {181, 26}}
+ {{157, 84}, {181, 26}}
2
@@ -2696,7 +2696,7 @@
268
- {{16, 53}, {141, 18}}
+ {{16, 54}, {141, 18}}
2
@@ -2720,7 +2720,7 @@
268
- {{155, 53}, {202, 18}}
+ {{155, 54}, {202, 18}}
2
@@ -2742,13 +2742,13 @@
- {{1, 1}, {509, 121}}
+ {{1, 1}, {509, 122}}
2
- {{14, 250}, {511, 137}}
+ {{14, 246}, {511, 138}}
2
@@ -2859,7 +2859,7 @@
2
- {{14, 153}, {511, 60}}
+ {{14, 170}, {511, 60}}
2
@@ -2944,7 +2944,7 @@
268
{{361, 12}, {138, 23}}
-
+
2
YES
@@ -3052,7 +3052,7 @@
2
- {{14, 53}, {511, 59}}
+ {{14, 96}, {511, 59}}
2
@@ -4027,7 +4027,7 @@
2
- {{14, 125}, {511, 266}}
+ {{14, 118}, {511, 266}}
2
@@ -4136,7 +4136,7 @@
268
{{163, 18}, {201, 22}}
-
+
2
YES
@@ -4416,7 +4416,7 @@
268
{{0, 91}, {536, 506}}
-
+
2
YES
@@ -4431,8 +4431,8 @@
- {{1, 1}, {462, 264}}
- {{0, 333}, {462, 264}}
+ {{1, 1}, {477, 264}}
+ {{0, 333}, {477, 264}}
2
@@ -4445,7 +4445,7 @@
256
{{463, 1}, {15, 264}}
-
+
YES
_doScroller:
@@ -4467,7 +4467,7 @@
{{18, 22}, {479, 266}}
-
+
2
133842
@@ -4481,7 +4481,7 @@
2
- {{14, 21}, {511, 364}}
+ {{14, 20}, {511, 364}}
2
@@ -4563,42 +4563,6 @@
274
YES
-
-
- 12
-
- YES
-
-
- 274
- {{1, 1}, {509, 204}}
-
-
- 2
-
-
- {{14, 47}, {511, 220}}
-
-
- 2
- {0, 0}
-
- 67239424
- 0
- IORegistry
-
-
-
- 3
- MCAwLjgwMDAwMDAxAA
-
-
-
- 1
- 0
- 2
- NO
-
12
@@ -4750,7 +4714,7 @@
2
- {{14, 277}, {511, 103}}
+ {{14, 280}, {511, 103}}
2
@@ -4772,6 +4736,42 @@
2
NO
+
+
+ 12
+
+ YES
+
+
+ 274
+ {{1, 1}, {509, 204}}
+
+
+ 2
+
+
+ {{14, 50}, {511, 220}}
+
+
+ 2
+ {0, 0}
+
+ 67239424
+ 0
+ IORegistry
+
+
+
+ 3
+ MCAwLjgwMDAwMDAxAA
+
+
+
+ 1
+ 0
+ 2
+ NO
+
268
@@ -4821,7 +4821,7 @@
268
{{355, 13}, {168, 25}}
-
+
2
YES
@@ -4898,10 +4898,44 @@
274
YES
+
+
+ 256
+
+ YES
+
+ YES
+ Apple PDF pasteboard type
+ Apple PICT pasteboard type
+ Apple PNG pasteboard type
+ NSFilenamesPboardType
+ NeXT Encapsulated PostScript v1.2 pasteboard type
+ NeXT TIFF v4.0 pasteboard type
+
+
+ {{138, 350}, {280, 45}}
+
+
+ 2
+ YES
+
+ 130560
+ 33554432
+
+ NSImage
+ name
+
+ 0
+ 0
+ 0
+ YES
+
+ YES
+
264
- {{14, 337}, {509, 17}}
+ {{18, 330}, {509, 17}}
2
@@ -4924,10 +4958,44 @@
+
+
+ 256
+
+ YES
+
+ YES
+ Apple PDF pasteboard type
+ Apple PICT pasteboard type
+ Apple PNG pasteboard type
+ NSFilenamesPboardType
+ NeXT Encapsulated PostScript v1.2 pasteboard type
+ NeXT TIFF v4.0 pasteboard type
+
+
+ {{217, 222}, {100, 100}}
+
+
+ 2
+ YES
+
+ 130560
+ 33554432
+
+ NSImage
+ cham
+
+ 0
+ 0
+ 0
+ YES
+
+ YES
+
268
- {{62, 37}, {411, 231}}
+ {{62, 25}, {411, 231}}
@@ -4960,44 +5028,10 @@
-
-
- 256
-
- YES
-
- YES
- Apple PDF pasteboard type
- Apple PICT pasteboard type
- Apple PNG pasteboard type
- NSFilenamesPboardType
- NeXT Encapsulated PostScript v1.2 pasteboard type
- NeXT TIFF v4.0 pasteboard type
-
-
- {{217, 240}, {100, 100}}
-
-
- 2
- YES
-
- 130560
- 33554432
-
- NSImage
- cham
-
- 0
- 0
- 0
- YES
-
- YES
-
{{1, 1}, {539, 403}}
-
+
2
@@ -5028,40 +5062,6 @@
MC42OTcwODAyOTIAA
-
-
- 256
-
- YES
-
- YES
- Apple PDF pasteboard type
- Apple PICT pasteboard type
- Apple PNG pasteboard type
- NSFilenamesPboardType
- NeXT Encapsulated PostScript v1.2 pasteboard type
- NeXT TIFF v4.0 pasteboard type
-
-
- {{141, 358}, {262, 45}}
-
-
- 2
- YES
-
- 130560
- 33554432
-
- NSImage
- name
-
- 0
- 0
- 0
- YES
-
- YES
-
{541, 405}
@@ -5134,6 +5134,7 @@
{{290, 8}, {372, 17}}
+
2
_NS:4068
YES
@@ -7001,10 +7002,10 @@
YES
-
+
@@ -7185,10 +7186,10 @@
YES
+
-
@@ -7290,9 +7291,9 @@
YES
-
+
@@ -7311,7 +7312,6 @@
YES
-
@@ -7322,26 +7322,13 @@
YES
+
+
-
- 918
-
-
- YES
-
-
-
-
-
- 919
-
-
-
-
284
@@ -9146,6 +9133,20 @@
+
+ 918
+
+
+ YES
+
+
+
+
+
+ 919
+
+
+