Change "Generate" to "Regenerate" in Preferences. Fixes #1128
1.1 --- a/Copyright.txt Tue Mar 16 22:14:34 2010 -0400
1.2 +++ b/Copyright.txt Sun Mar 21 00:06:56 2010 -0400
1.3 @@ -22,6 +22,7 @@
1.4 Augie Fackler
1.5 Ken Ferry
1.6 Christopher Forsythe
1.7 +Tyler Funnell
1.8 Brian Ganninger
1.9 Ryan Govostes
1.10 Asher Haig
2.1 --- a/Resources/en.lproj/OTRPrefs.nib/classes.nib Tue Mar 16 22:14:34 2010 -0400
2.2 +++ b/Resources/en.lproj/OTRPrefs.nib/classes.nib Sun Mar 21 00:06:56 2010 -0400
2.3 @@ -6,14 +6,6 @@
2.4 <array>
2.5 <dict>
2.6 <key>CLASS</key>
2.7 - <string>AIObject</string>
2.8 - <key>LANGUAGE</key>
2.9 - <string>ObjC</string>
2.10 - <key>SUPERCLASS</key>
2.11 - <string>NSObject</string>
2.12 - </dict>
2.13 - <dict>
2.14 - <key>CLASS</key>
2.15 <string>NSApplication</string>
2.16 <key>LANGUAGE</key>
2.17 <string>ObjC</string>
2.18 @@ -22,6 +14,19 @@
2.19 </dict>
2.20 <dict>
2.21 <key>CLASS</key>
2.22 + <string>RBSplitView</string>
2.23 + <key>LANGUAGE</key>
2.24 + <string>ObjC</string>
2.25 + <key>OUTLETS</key>
2.26 + <dict>
2.27 + <key>delegate</key>
2.28 + <string>id</string>
2.29 + </dict>
2.30 + <key>SUPERCLASS</key>
2.31 + <string>RBSplitSubview</string>
2.32 + </dict>
2.33 + <dict>
2.34 + <key>CLASS</key>
2.35 <string>NSTextField</string>
2.36 <key>LANGUAGE</key>
2.37 <string>ObjC</string>
2.38 @@ -29,14 +34,42 @@
2.39 <string>NSControl</string>
2.40 </dict>
2.41 <dict>
2.42 + <key>CLASS</key>
2.43 + <string>AIAdvancedPreferencePane</string>
2.44 + <key>LANGUAGE</key>
2.45 + <string>ObjC</string>
2.46 + <key>SUPERCLASS</key>
2.47 + <string>AIModularPane</string>
2.48 + </dict>
2.49 + <dict>
2.50 + <key>CLASS</key>
2.51 + <string>RBSplitSubview</string>
2.52 + <key>LANGUAGE</key>
2.53 + <string>ObjC</string>
2.54 + <key>SUPERCLASS</key>
2.55 + <string>NSView</string>
2.56 + </dict>
2.57 + <dict>
2.58 + <key>CLASS</key>
2.59 + <string>NSMenu</string>
2.60 + <key>LANGUAGE</key>
2.61 + <string>ObjC</string>
2.62 + <key>SUPERCLASS</key>
2.63 + <string>NSObject</string>
2.64 + </dict>
2.65 + <dict>
2.66 <key>ACTIONS</key>
2.67 <dict>
2.68 <key>adiumPrint</key>
2.69 <string>id</string>
2.70 + <key>didAdjustSubviews</key>
2.71 + <string>RBSplitView</string>
2.72 <key>prefsWindowWillClose</key>
2.73 <string>SS_PrefsController</string>
2.74 <key>toggleFindPanel</key>
2.75 <string>id</string>
2.76 + <key>willAdjustSubviews</key>
2.77 + <string>RBSplitView</string>
2.78 </dict>
2.79 <key>CLASS</key>
2.80 <string>NSObject</string>
2.81 @@ -52,34 +85,88 @@
2.82 <string>NSResponder</string>
2.83 </dict>
2.84 <dict>
2.85 + <key>CLASS</key>
2.86 + <string>NSScrollView</string>
2.87 + <key>LANGUAGE</key>
2.88 + <string>ObjC</string>
2.89 + <key>SUPERCLASS</key>
2.90 + <string>NSView</string>
2.91 + </dict>
2.92 + <dict>
2.93 + <key>CLASS</key>
2.94 + <string>NSView</string>
2.95 + <key>LANGUAGE</key>
2.96 + <string>ObjC</string>
2.97 + <key>SUPERCLASS</key>
2.98 + <string>NSResponder</string>
2.99 + </dict>
2.100 + <dict>
2.101 + <key>CLASS</key>
2.102 + <string>NSMenuItem</string>
2.103 + <key>LANGUAGE</key>
2.104 + <string>ObjC</string>
2.105 + <key>SUPERCLASS</key>
2.106 + <string>NSObject</string>
2.107 + </dict>
2.108 + <dict>
2.109 + <key>CLASS</key>
2.110 + <string>FirstResponder</string>
2.111 + <key>LANGUAGE</key>
2.112 + <string>ObjC</string>
2.113 + <key>SUPERCLASS</key>
2.114 + <string>NSObject</string>
2.115 + </dict>
2.116 + <dict>
2.117 + <key>CLASS</key>
2.118 + <string>NSCell</string>
2.119 + <key>LANGUAGE</key>
2.120 + <string>ObjC</string>
2.121 + <key>SUPERCLASS</key>
2.122 + <string>NSObject</string>
2.123 + </dict>
2.124 + <dict>
2.125 <key>ACTIONS</key>
2.126 <dict>
2.127 - <key>generate</key>
2.128 - <string>id</string>
2.129 - <key>selectAccount</key>
2.130 - <string>id</string>
2.131 - <key>showFingerprint</key>
2.132 + <key>changePreference</key>
2.133 <string>id</string>
2.134 </dict>
2.135 <key>CLASS</key>
2.136 - <string>ESGaimOTRPreferences</string>
2.137 + <string>AIModularPane</string>
2.138 <key>LANGUAGE</key>
2.139 <string>ObjC</string>
2.140 <key>OUTLETS</key>
2.141 <dict>
2.142 - <key>button_generate</key>
2.143 - <string>NSButton</string>
2.144 - <key>button_showFingerprint</key>
2.145 - <string>NSButton</string>
2.146 - <key>popUp_accounts</key>
2.147 - <string>NSPopUpButton</string>
2.148 - <key>tableView_fingerprints</key>
2.149 - <string>NSTableView</string>
2.150 - <key>textField_privateKey</key>
2.151 - <string>NSTextField</string>
2.152 + <key>plugin</key>
2.153 + <string>id</string>
2.154 + <key>view</key>
2.155 + <string>NSView</string>
2.156 </dict>
2.157 <key>SUPERCLASS</key>
2.158 - <string>AIPreferencePane</string>
2.159 + <string>NSObject</string>
2.160 + </dict>
2.161 + <dict>
2.162 + <key>CLASS</key>
2.163 + <string>NSButton</string>
2.164 + <key>LANGUAGE</key>
2.165 + <string>ObjC</string>
2.166 + <key>SUPERCLASS</key>
2.167 + <string>NSControl</string>
2.168 + </dict>
2.169 + <dict>
2.170 + <key>CLASS</key>
2.171 + <string>NSPopUpButton</string>
2.172 + <key>LANGUAGE</key>
2.173 + <string>ObjC</string>
2.174 + <key>SUPERCLASS</key>
2.175 + <string>NSButton</string>
2.176 + </dict>
2.177 + <dict>
2.178 + <key>CLASS</key>
2.179 + <string>NSPopUpButtonCell</string>
2.180 + <key>LANGUAGE</key>
2.181 + <string>ObjC</string>
2.182 + <key>SUPERCLASS</key>
2.183 + <string>NSMenuItemCell</string>
2.184 </dict>
2.185 <dict>
2.186 <key>CLASS</key>
2.187 @@ -102,22 +189,6 @@
2.188 </dict>
2.189 <dict>
2.190 <key>CLASS</key>
2.191 - <string>FirstResponder</string>
2.192 - <key>LANGUAGE</key>
2.193 - <string>ObjC</string>
2.194 - <key>SUPERCLASS</key>
2.195 - <string>NSObject</string>
2.196 - </dict>
2.197 - <dict>
2.198 - <key>CLASS</key>
2.199 - <string>AIPreferencePane</string>
2.200 - <key>LANGUAGE</key>
2.201 - <string>ObjC</string>
2.202 - <key>SUPERCLASS</key>
2.203 - <string>AIModularPane</string>
2.204 - </dict>
2.205 - <dict>
2.206 - <key>CLASS</key>
2.207 <string>NSButtonCell</string>
2.208 <key>LANGUAGE</key>
2.209 <string>ObjC</string>
2.210 @@ -127,22 +198,30 @@
2.211 <dict>
2.212 <key>ACTIONS</key>
2.213 <dict>
2.214 - <key>changePreference</key>
2.215 + <key>generate</key>
2.216 + <string>id</string>
2.217 + <key>showFingerprint</key>
2.218 <string>id</string>
2.219 </dict>
2.220 <key>CLASS</key>
2.221 - <string>AIModularPane</string>
2.222 + <string>ESOTRPreferences</string>
2.223 <key>LANGUAGE</key>
2.224 <string>ObjC</string>
2.225 <key>OUTLETS</key>
2.226 <dict>
2.227 - <key>plugin</key>
2.228 - <string>id</string>
2.229 - <key>view</key>
2.230 - <string>NSView</string>
2.231 + <key>button_generate</key>
2.232 + <string>NSButton</string>
2.233 + <key>button_showFingerprint</key>
2.234 + <string>NSButton</string>
2.235 + <key>popUp_accounts</key>
2.236 + <string>NSPopUpButton</string>
2.237 + <key>tableView_fingerprints</key>
2.238 + <string>NSTableView</string>
2.239 + <key>textField_privateKey</key>
2.240 + <string>NSTextField</string>
2.241 </dict>
2.242 <key>SUPERCLASS</key>
2.243 - <string>AIObject</string>
2.244 + <string>AIAdvancedPreferencePane</string>
2.245 </dict>
2.246 <dict>
2.247 <key>CLASS</key>
2.248 @@ -159,7 +238,7 @@
2.249 </dict>
2.250 <dict>
2.251 <key>CLASS</key>
2.252 - <string>NSButton</string>
2.253 + <string>NSTableView</string>
2.254 <key>LANGUAGE</key>
2.255 <string>ObjC</string>
2.256 <key>SUPERCLASS</key>
3.1 --- a/Resources/en.lproj/OTRPrefs.nib/info.nib Tue Mar 16 22:14:34 2010 -0400
3.2 +++ b/Resources/en.lproj/OTRPrefs.nib/info.nib Sun Mar 21 00:06:56 2010 -0400
3.3 @@ -3,7 +3,9 @@
3.4 <plist version="1.0">
3.5 <dict>
3.6 <key>IBFramework Version</key>
3.7 - <string>667</string>
3.8 + <string>677</string>
3.9 + <key>IBLastKnownRelativeProjectPath</key>
3.10 + <string>../../Adium.xcodeproj</string>
3.11 <key>IBOldestOS</key>
3.12 <integer>5</integer>
3.13 <key>IBOpenObjects</key>
3.14 @@ -11,7 +13,7 @@
3.15 <integer>5</integer>
3.16 </array>
3.17 <key>IBSystem Version</key>
3.18 - <string>9D34</string>
3.19 + <string>9J61</string>
3.20 <key>targetFramework</key>
3.21 <string>IBCocoaFramework</string>
3.22 </dict>
4.1 Binary file Resources/en.lproj/OTRPrefs.nib/keyedobjects.nib has changed
5.1 --- a/Source/ESOTRPreferences.m Tue Mar 16 22:14:34 2010 -0400
5.2 +++ b/Source/ESOTRPreferences.m Sun Mar 21 00:06:56 2010 -0400
5.3 @@ -194,8 +194,10 @@
5.4 fingerprint_buf, accountname, protocol);
5.5
5.6 if (fingerprint) {
5.7 + [button_generate setTitle:AILocalizedString(@"Regenerate", nil)];
5.8 fingerprintString = [NSString stringWithFormat:AILocalizedString(@"Fingerprint: %.80s",nil), fingerprint];
5.9 } else {
5.10 + [button_generate setTitle:AILocalizedString(@"Generate", nil)];
5.11 fingerprintString = AILocalizedString(@"No private key present", "Message to show in the Encryption OTR preferences when an account is selected which does not have a private key");
5.12 }
5.13 }