--- a/Adium.xcodeproj/project.pbxproj Fri Dec 06 13:11:01 2013 +0100
+++ b/Adium.xcodeproj/project.pbxproj Fri Dec 06 13:24:13 2013 +0100
@@ -1033,7 +1033,7 @@
5A4BD41D13F855B000A4D3F7 /* SearchTerms.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5A4BD41B13F855B000A4D3F7 /* SearchTerms.plist */; };
5A4BD41E13F8568100A4D3F7 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5ACF27331392C585004B6AEF /* Preferences.xib */; };
5A4BD43313F856E300A4D3F7 /* Preferences-AddressBookIntegration.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5AC7F26313B42952002D7265 /* Preferences-AddressBookIntegration.xib */; };
- 5A4BD44813F8575900A4D3F7 /* Preferences-Encryption.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5AC7F26513B42A55002D7265 /* Preferences-Encryption.xib */; };
+ 5A4BD44813F8575900A4D3F7 /* Preferences-OTREncryption.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5AC7F26513B42A55002D7265 /* Preferences-OTREncryption.xib */; }; 5A4BD45D13F857DE00A4D3F7 /* Preferences-MessageAlerts.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5AC7F26713B43612002D7265 /* Preferences-MessageAlerts.xib */; };
5A4BD47313F858EE00A4D3F7 /* Preferences-ContactList.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A4BD47213F858EE00A4D3F7 /* Preferences-ContactList.xib */; };
5A4BD48913F859EF00A4D3F7 /* Preferences-WindowHandling.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A4BD48813F859EF00A4D3F7 /* Preferences-WindowHandling.xib */; };
@@ -4013,7 +4013,7 @@
5A9A9F8A11F295EB00328DF9 /* events-do-nothing.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "events-do-nothing.tiff"; path = "Resources/events-do-nothing.tiff"; sourceTree = SOURCE_ROOT; };
5AA2A0ED14B3EFF500B4DB65 /* AIOSCompatibility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIOSCompatibility.h; path = "Frameworks/AIUtilities Framework/Source/AIOSCompatibility.h"; sourceTree = "<group>"; };
5AC7F26313B42952002D7265 /* Preferences-AddressBookIntegration.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-AddressBookIntegration.xib"; path = "Resources/Preferences-AddressBookIntegration.xib"; sourceTree = "<group>"; };
- 5AC7F26513B42A55002D7265 /* Preferences-Encryption.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-Encryption.xib"; path = "Resources/Preferences-Encryption.xib"; sourceTree = "<group>"; };
+ 5AC7F26513B42A55002D7265 /* Preferences-OTREncryption.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-OTREncryption.xib"; path = "Resources/Preferences-OTREncryption.xib"; sourceTree = "<group>"; }; 5AC7F26713B43612002D7265 /* Preferences-MessageAlerts.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-MessageAlerts.xib"; path = "Resources/Preferences-MessageAlerts.xib"; sourceTree = "<group>"; };
5ACA086817873AEA00B15047 /* AIButtonWithCursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIButtonWithCursor.h; path = "Frameworks/AIUtilities Framework/Source/AIButtonWithCursor.h"; sourceTree = "<group>"; };
5ACA086917873AEA00B15047 /* AIButtonWithCursor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIButtonWithCursor.m; path = "Frameworks/AIUtilities Framework/Source/AIButtonWithCursor.m"; sourceTree = "<group>"; };
@@ -5221,7 +5221,7 @@
341BD5530965E90A00CF83F5 /* OTR */ = {
- 5AC7F26513B42A55002D7265 /* Preferences-Encryption.xib */,
+ 5AC7F26513B42A55002D7265 /* Preferences-OTREncryption.xib */, 341BD5690965E9A500CF83F5 /* AdiumOTREncryption.h */,
341BD56A0965E9A500CF83F5 /* AdiumOTREncryption.m */,
341BD56E0965EC3500CF83F5 /* OTRFingerprintDetailsWindow.xib */,
@@ -9926,7 +9926,7 @@
5A4BD41D13F855B000A4D3F7 /* SearchTerms.plist in Resources */,
5A4BD41E13F8568100A4D3F7 /* Preferences.xib in Resources */,
5A4BD43313F856E300A4D3F7 /* Preferences-AddressBookIntegration.xib in Resources */,
- 5A4BD44813F8575900A4D3F7 /* Preferences-Encryption.xib in Resources */,
+ 5A4BD44813F8575900A4D3F7 /* Preferences-OTREncryption.xib in Resources */, 5A4BD45D13F857DE00A4D3F7 /* Preferences-MessageAlerts.xib in Resources */,
5A4BD47313F858EE00A4D3F7 /* Preferences-ContactList.xib in Resources */,
5A4BD48913F859EF00A4D3F7 /* Preferences-WindowHandling.xib in Resources */,
--- a/Source/ESOTRPreferences.m Fri Dec 06 13:11:01 2013 +0100
+++ b/Source/ESOTRPreferences.m Fri Dec 06 13:24:13 2013 +0100
@@ -42,10 +42,10 @@
- return AILocalizedString(@"Encryption",nil);
+ return AILocalizedString(@"OTR Encryption",nil); - return @"Preferences-Encryption";
+ return @"Preferences-OTREncryption"; return [NSImage imageNamed:@"lock-locked" forClass:[adium class]];