adium 3917:3b1b884f27c0: Renamed "Use First if Nick not availabl...
commits at adium.im
commits at adium.im
Fri May 27 16:04:27 UTC 2011
details: http://hg.adium.im/adium/rev/3b1b884f27c0
revision: 3917:3b1b884f27c0
branch: (none)
author: Patrick Steinhardt <steinhardt.p at me.com>
date: Thu May 26 12:48:45 2011 +0200
Renamed "Use First if Nick not available" and replaced "Use Nick if First not available" with "Use Nick exclusively if available".
r=xnyhps
diffs (574 lines):
diff -r 28489468e04c -r 3b1b884f27c0 Frameworks/Adium Framework/Resources/AB Display Format Defaults.plist
--- a/Frameworks/Adium Framework/Resources/AB Display Format Defaults.plist Thu May 26 12:29:15 2011 +0200
+++ b/Frameworks/Adium Framework/Resources/AB Display Format Defaults.plist Thu May 26 12:48:45 2011 +0200
@@ -18,7 +18,7 @@
<true/>
<key>AB Use FirstName</key>
<true/>
- <key>AB Use NickName</key>
- <true/>
+ <key>AB Use NickName Only</key>
+ <false/>
</dict>
</plist>
diff -r 28489468e04c -r 3b1b884f27c0 Frameworks/Adium Framework/Source/AIAddressBookController.h
--- a/Frameworks/Adium Framework/Source/AIAddressBookController.h Thu May 26 12:29:15 2011 +0200
+++ b/Frameworks/Adium Framework/Source/AIAddressBookController.h Thu May 26 12:48:45 2011 +0200
@@ -27,7 +27,7 @@
#define KEY_AB_IMAGE_SYNC @"AB Image Sync"
#define KEY_AB_PREFER_ADDRESS_BOOK_IMAGES @"AB Prefer AB Images"
#define KEY_AB_USE_FIRSTNAME @"AB Use FirstName"
-#define KEY_AB_USE_NICKNAME @"AB Use NickName"
+#define KEY_AB_USE_NICKNAME @"AB Use NickName Only"
#define KEY_AB_CREATE_METACONTACTS @"AB Create MetaContacts"
#define AB_DISPLAYFORMAT_DEFAULT_PREFS @"AB Display Format Defaults"
@@ -60,7 +60,7 @@
NSString *displayFormat;
BOOL enableImport;
BOOL useFirstName;
- BOOL useNickName;
+ BOOL useNickNameOnly;
BOOL automaticUserIconSync;
BOOL createMetaContacts;
diff -r 28489468e04c -r 3b1b884f27c0 Frameworks/Adium Framework/Source/AIAddressBookController.m
--- a/Frameworks/Adium Framework/Source/AIAddressBookController.m Thu May 26 12:29:15 2011 +0200
+++ b/Frameworks/Adium Framework/Source/AIAddressBookController.m Thu May 26 12:48:45 2011 +0200
@@ -113,8 +113,8 @@
group:PREF_GROUP_ADDRESSBOOK] retain];
useFirstName = [[adium.preferenceController preferenceForKey:KEY_AB_USE_FIRSTNAME
group:PREF_GROUP_ADDRESSBOOK] boolValue];
- useNickName = [[adium.preferenceController preferenceForKey:KEY_AB_USE_NICKNAME
- group:PREF_GROUP_ADDRESSBOOK] boolValue];
+ useNickNameOnly = [[adium.preferenceController preferenceForKey:KEY_AB_USE_NICKNAME
+ group:PREF_GROUP_ADDRESSBOOK] boolValue];
}
//If old format-menu preference is set, perform migration
@@ -474,10 +474,11 @@
BOOL havePhonetic = ((phonetic != NULL) && (phoneticFirstName || phoneticMiddleName || phoneticLastName));
+ if (useNickNameOnly && nickName && [nickName length] != 0)
+ return nickName;
+
if (useFirstName && (!nickName || [nickName isEqualToString:@""]) && firstName)
nickName = firstName;
- else if (useNickName && (!firstName || [firstName isEqualToString:@""]) && nickName)
- firstName = nickName;
displayName = [displayName stringByReplacingOccurrencesOfString:FORMAT_FIRST_FULL
@@ -550,7 +551,7 @@
enableImport = [[prefDict objectForKey:KEY_AB_ENABLE_IMPORT] boolValue];
automaticUserIconSync = [[prefDict objectForKey:KEY_AB_IMAGE_SYNC] boolValue];
useFirstName = [[prefDict objectForKey:KEY_AB_USE_FIRSTNAME] boolValue];
- useNickName = [[prefDict objectForKey:KEY_AB_USE_NICKNAME] boolValue];
+ useNickNameOnly = [[prefDict objectForKey:KEY_AB_USE_NICKNAME] boolValue];
displayFormat = [[prefDict objectForKey:KEY_AB_DISPLAYFORMAT] retain];
diff -r 28489468e04c -r 3b1b884f27c0 Resources/AddressBookPrefs.nib/designable.nib
--- a/Resources/AddressBookPrefs.nib/designable.nib Thu May 26 12:29:15 2011 +0200
+++ b/Resources/AddressBookPrefs.nib/designable.nib Thu May 26 12:48:45 2011 +0200
@@ -3,12 +3,12 @@
<data>
<int key="IBDocument.SystemTarget">1060</int>
<string key="IBDocument.SystemVersion">10J869</string>
- <string key="IBDocument.InterfaceBuilderVersion">1305</string>
+ <string key="IBDocument.InterfaceBuilderVersion">1306</string>
<string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">1305</string>
+ <string key="NS.object.0">1306</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSTextField</string>
@@ -49,13 +49,12 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{19, 149}, {245, 18}}</string>
<reference key="NSSuperview" ref="1056980084"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="401818986"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="369834959">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">131072</int>
- <string key="NSContents">Use Nick if First is not available</string>
+ <string key="NSContents">Use Nick exclusively if available</string>
<object class="NSFont" key="NSSupport" id="115310829">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">11</double>
@@ -82,13 +81,12 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{19, 169}, {245, 18}}</string>
<reference key="NSSuperview" ref="1056980084"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="830040855"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="79274371">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">131072</int>
- <string key="NSContents">Use First if Nick is not available</string>
+ <string key="NSContents">Replace Nick with First if not available</string>
<reference key="NSSupport" ref="115310829"/>
<reference key="NSControlView" ref="940660"/>
<int key="NSButtonFlags">1211912703</int>
@@ -114,7 +112,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{10, 15}, {70, 14}}</string>
<reference key="NSSuperview" ref="636212990"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="287063788"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="781720128">
@@ -148,7 +145,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{10, 40}, {70, 14}}</string>
<reference key="NSSuperview" ref="636212990"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="195663535"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="258882054">
@@ -166,7 +162,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{179, 40}, {70, 14}}</string>
<reference key="NSSuperview" ref="636212990"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="576439752"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1061240405">
@@ -184,7 +179,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{179, 15}, {70, 14}}</string>
<reference key="NSSuperview" ref="636212990"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="909944675"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="922932982">
@@ -205,7 +199,6 @@
</set>
<string key="NSFrame">{{79, 39}, {93, 17}}</string>
<reference key="NSSuperview" ref="636212990"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="981902426"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTokenFieldCell" key="NSCell" id="728397387">
@@ -270,7 +263,6 @@
</set>
<string key="NSFrame">{{79, 9}, {93, 22}}</string>
<reference key="NSSuperview" ref="636212990"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="968337851"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTokenFieldCell" key="NSCell" id="190851223">
@@ -323,7 +315,6 @@
</set>
<string key="NSFrame">{{245, 39}, {120, 17}}</string>
<reference key="NSSuperview" ref="636212990"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="970388425"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTokenFieldCell" key="NSCell" id="98995285">
@@ -376,7 +367,6 @@
</set>
<string key="NSFrame">{{245, 14}, {120, 17}}</string>
<reference key="NSSuperview" ref="636212990"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="940660"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTokenFieldCell" key="NSCell" id="922378431">
@@ -424,13 +414,11 @@
</array>
<string key="NSFrame">{{1, 1}, {368, 61}}</string>
<reference key="NSSuperview" ref="49347676"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="23064184"/>
</object>
</array>
<string key="NSFrame">{{18, 189}, {370, 77}}</string>
<reference key="NSSuperview" ref="1056980084"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="636212990"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -462,7 +450,6 @@
</set>
<string key="NSFrame">{{120, 275}, {264, 21}}</string>
<reference key="NSSuperview" ref="1056980084"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="49347676"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTokenFieldCell" key="NSCell" id="798460398">
@@ -488,7 +475,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 278}, {99, 14}}</string>
<reference key="NSSuperview" ref="1056980084"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="365339894"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="504239461">
@@ -506,7 +492,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 304}, {306, 18}}</string>
<reference key="NSSuperview" ref="1056980084"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="951279381"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="758199240">
@@ -530,7 +515,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 326}, {307, 14}}</string>
<reference key="NSSuperview" ref="1056980084"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="908619062"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="420548907">
@@ -552,7 +536,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 127}, {307, 14}}</string>
<reference key="NSSuperview" ref="1056980084"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="274895758"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="906057447">
@@ -570,7 +553,6 @@
<int key="NSvFlags">266</int>
<string key="NSFrame">{{3, 125}, {402, 5}}</string>
<reference key="NSSuperview" ref="1056980084"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="908159057"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -594,7 +576,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 103}, {306, 18}}</string>
<reference key="NSSuperview" ref="1056980084"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="350360009"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="973467239">
@@ -618,7 +599,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 63}, {306, 18}}</string>
<reference key="NSSuperview" ref="1056980084"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="533129817"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="180231265">
@@ -642,7 +622,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{18, 83}, {288, 18}}</string>
<reference key="NSSuperview" ref="1056980084"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="349756092"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="618425859">
@@ -666,7 +645,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 40}, {307, 14}}</string>
<reference key="NSSuperview" ref="1056980084"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="685860409"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="239031865">
@@ -684,8 +662,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 16}, {298, 18}}</string>
<reference key="NSSuperview" ref="1056980084"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="545570160">
<int key="NSCellFlags">67239424</int>
@@ -708,7 +684,6 @@
<int key="NSvFlags">266</int>
<string key="NSFrame">{{3, 38}, {402, 5}}</string>
<reference key="NSSuperview" ref="1056980084"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="197595407"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -732,7 +707,6 @@
<int key="NSvFlags">266</int>
<string key="NSFrame">{{3, 324}, {402, 5}}</string>
<reference key="NSSuperview" ref="1056980084"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="485817221"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -754,7 +728,6 @@
</array>
<string key="NSFrameSize">{405, 340}</string>
<reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="293344676"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
@@ -1510,248 +1483,7 @@
<nil key="sourceID"/>
<int key="maxID">251</int>
</object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <array class="NSMutableArray" key="referencedPartialClassDescriptions">
- <object class="IBPartialClassDescription">
- <string key="className">AIAdvancedPreferencePane</string>
- <string key="superclassName">AIModularPane</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/AIAdvancedPreferencePane.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">AILocalizationButton</string>
- <string key="superclassName">NSButton</string>
- <dictionary class="NSMutableDictionary" key="outlets">
- <string key="view_anchorToLeftSide">NSView</string>
- <string key="view_anchorToRightSide">NSView</string>
- <string key="window_anchorOnLeftSide">NSWindow</string>
- <string key="window_anchorOnRightSide">NSWindow</string>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
- <object class="IBToOneOutletInfo" key="view_anchorToLeftSide">
- <string key="name">view_anchorToLeftSide</string>
- <string key="candidateClassName">NSView</string>
- </object>
- <object class="IBToOneOutletInfo" key="view_anchorToRightSide">
- <string key="name">view_anchorToRightSide</string>
- <string key="candidateClassName">NSView</string>
- </object>
- <object class="IBToOneOutletInfo" key="window_anchorOnLeftSide">
- <string key="name">window_anchorOnLeftSide</string>
- <string key="candidateClassName">NSWindow</string>
- </object>
- <object class="IBToOneOutletInfo" key="window_anchorOnRightSide">
- <string key="name">window_anchorOnRightSide</string>
- <string key="candidateClassName">NSWindow</string>
- </object>
- </dictionary>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/AILocalizationButton.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">AILocalizationTextField</string>
- <string key="superclassName">NSTextField</string>
- <dictionary class="NSMutableDictionary" key="outlets">
- <string key="view_anchorToLeftSide">NSView</string>
- <string key="view_anchorToRightSide">NSView</string>
- <string key="window_anchorOnLeftSide">NSWindow</string>
- <string key="window_anchorOnRightSide">NSWindow</string>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
- <object class="IBToOneOutletInfo" key="view_anchorToLeftSide">
- <string key="name">view_anchorToLeftSide</string>
- <string key="candidateClassName">NSView</string>
- </object>
- <object class="IBToOneOutletInfo" key="view_anchorToRightSide">
- <string key="name">view_anchorToRightSide</string>
- <string key="candidateClassName">NSView</string>
- </object>
- <object class="IBToOneOutletInfo" key="window_anchorOnLeftSide">
- <string key="name">window_anchorOnLeftSide</string>
- <string key="candidateClassName">NSWindow</string>
- </object>
- <object class="IBToOneOutletInfo" key="window_anchorOnRightSide">
- <string key="name">window_anchorOnRightSide</string>
- <string key="candidateClassName">NSWindow</string>
- </object>
- </dictionary>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/AILocalizationTextField.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">AIModularPane</string>
- <string key="superclassName">NSObject</string>
- <object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">changePreference:</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">changePreference:</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">changePreference:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">view</string>
- <string key="NS.object.0">NSView</string>
- </object>
- <object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <string key="NS.key.0">view</string>
- <object class="IBToOneOutletInfo" key="NS.object.0">
- <string key="name">view</string>
- <string key="candidateClassName">NSView</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/AIModularPane.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">ESAddressBookIntegrationAdvancedPreferences</string>
- <string key="superclassName">AIAdvancedPreferencePane</string>
- <dictionary class="NSMutableDictionary" key="actions">
- <string key="changeFormat:">id</string>
- <string key="changePreference:">id</string>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="actionInfosByName">
- <object class="IBActionInfo" key="changeFormat:">
- <string key="name">changeFormat:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="changePreference:">
- <string key="name">changePreference:</string>
- <string key="candidateClassName">id</string>
- </object>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="outlets">
- <string key="box_nameElements">AILocalizationBox</string>
- <string key="checkBox_enableImport">NSButton</string>
- <string key="checkBox_enableNoteSync">NSButton</string>
- <string key="checkBox_metaContacts">NSButton</string>
- <string key="checkBox_preferABImages">NSButton</string>
- <string key="checkBox_syncAutomatic">NSButton</string>
- <string key="checkBox_useABImages">NSButton</string>
- <string key="checkBox_useFirstName">NSButton</string>
- <string key="checkBox_useNickName">NSButton</string>
- <string key="label_contacts">AILocalizationTextField</string>
- <string key="label_firstToken">AILocalizationTextField</string>
- <string key="label_formatNamesAs">AILocalizationTextField</string>
- <string key="label_images">AILocalizationTextField</string>
- <string key="label_lastToken">AILocalizationTextField</string>
- <string key="label_middleToken">AILocalizationTextField</string>
- <string key="label_names">AILocalizationTextField</string>
- <string key="label_nickToken">AILocalizationTextField</string>
- <string key="tokenField_firstToken">NSTokenField</string>
- <string key="tokenField_format">NSTokenField</string>
- <string key="tokenField_lastToken">NSTokenField</string>
- <string key="tokenField_middleToken">NSTokenField</string>
- <string key="tokenField_nickToken">NSTokenField</string>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
- <object class="IBToOneOutletInfo" key="box_nameElements">
- <string key="name">box_nameElements</string>
- <string key="candidateClassName">AILocalizationBox</string>
- </object>
- <object class="IBToOneOutletInfo" key="checkBox_enableImport">
- <string key="name">checkBox_enableImport</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- <object class="IBToOneOutletInfo" key="checkBox_enableNoteSync">
- <string key="name">checkBox_enableNoteSync</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- <object class="IBToOneOutletInfo" key="checkBox_metaContacts">
- <string key="name">checkBox_metaContacts</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- <object class="IBToOneOutletInfo" key="checkBox_preferABImages">
- <string key="name">checkBox_preferABImages</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- <object class="IBToOneOutletInfo" key="checkBox_syncAutomatic">
- <string key="name">checkBox_syncAutomatic</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- <object class="IBToOneOutletInfo" key="checkBox_useABImages">
- <string key="name">checkBox_useABImages</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- <object class="IBToOneOutletInfo" key="checkBox_useFirstName">
- <string key="name">checkBox_useFirstName</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- <object class="IBToOneOutletInfo" key="checkBox_useNickName">
- <string key="name">checkBox_useNickName</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- <object class="IBToOneOutletInfo" key="label_contacts">
- <string key="name">label_contacts</string>
- <string key="candidateClassName">AILocalizationTextField</string>
- </object>
- <object class="IBToOneOutletInfo" key="label_firstToken">
- <string key="name">label_firstToken</string>
- <string key="candidateClassName">AILocalizationTextField</string>
- </object>
- <object class="IBToOneOutletInfo" key="label_formatNamesAs">
- <string key="name">label_formatNamesAs</string>
- <string key="candidateClassName">AILocalizationTextField</string>
- </object>
- <object class="IBToOneOutletInfo" key="label_images">
- <string key="name">label_images</string>
- <string key="candidateClassName">AILocalizationTextField</string>
- </object>
- <object class="IBToOneOutletInfo" key="label_lastToken">
- <string key="name">label_lastToken</string>
- <string key="candidateClassName">AILocalizationTextField</string>
- </object>
- <object class="IBToOneOutletInfo" key="label_middleToken">
- <string key="name">label_middleToken</string>
- <string key="candidateClassName">AILocalizationTextField</string>
- </object>
- <object class="IBToOneOutletInfo" key="label_names">
- <string key="name">label_names</string>
- <string key="candidateClassName">AILocalizationTextField</string>
- </object>
- <object class="IBToOneOutletInfo" key="label_nickToken">
- <string key="name">label_nickToken</string>
- <string key="candidateClassName">AILocalizationTextField</string>
- </object>
- <object class="IBToOneOutletInfo" key="tokenField_firstToken">
- <string key="name">tokenField_firstToken</string>
- <string key="candidateClassName">NSTokenField</string>
- </object>
- <object class="IBToOneOutletInfo" key="tokenField_format">
- <string key="name">tokenField_format</string>
- <string key="candidateClassName">NSTokenField</string>
- </object>
- <object class="IBToOneOutletInfo" key="tokenField_lastToken">
- <string key="name">tokenField_lastToken</string>
- <string key="candidateClassName">NSTokenField</string>
- </object>
- <object class="IBToOneOutletInfo" key="tokenField_middleToken">
- <string key="name">tokenField_middleToken</string>
- <string key="candidateClassName">NSTokenField</string>
- </object>
- <object class="IBToOneOutletInfo" key="tokenField_nickToken">
- <string key="name">tokenField_nickToken</string>
- <string key="candidateClassName">NSTokenField</string>
- </object>
- </dictionary>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/ESAddressBookIntegrationAdvancedPreferences.h</string>
- </object>
- </object>
- </array>
- </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes"/>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
diff -r 28489468e04c -r 3b1b884f27c0 Source/ESAddressBookIntegrationAdvancedPreferences.m
--- a/Source/ESAddressBookIntegrationAdvancedPreferences.m Thu May 26 12:29:15 2011 +0200
+++ b/Source/ESAddressBookIntegrationAdvancedPreferences.m Thu May 26 12:48:45 2011 +0200
@@ -105,8 +105,8 @@
[tokenField_nickToken setStringValue:FORMAT_NICK_FULL];
[checkBox_enableImport setLocalizedString:AILocalizedString(@"Import my contacts' names from the Address Book",nil)];
- [checkBox_useFirstName setLocalizedString:AILocalizedString(@"Use First if Nick not available", nil)];
- [checkBox_useNickName setLocalizedString:AILocalizedString(@"Use Nick if First not available",nil)];
+ [checkBox_useFirstName setLocalizedString:AILocalizedString(@"Replace Nick with First if not available", nil)];
+ [checkBox_useNickName setLocalizedString:AILocalizedString(@"Use Nick exclusively if available",nil)];
[checkBox_useABImages setLocalizedString:AILocalizedString(@"Use Address Book images as contacts' icons",nil)];
[checkBox_preferABImages setLocalizedString:AILocalizedString(@"Even if the contact already has a contact icon",nil)];
[checkBox_syncAutomatic setLocalizedString:AILocalizedString(@"Overwrite Address Book images with contacts' icons",nil)];
More information about the commits
mailing list