adium 4695:be874da9a68d: Bring some consistency to the naming of...

commits at adium.im commits at adium.im
Thu Feb 23 18:43:16 UTC 2012


details:	http://hg.adium.im/adium/rev/be874da9a68d
revision:	4695:be874da9a68d
branch:		(none)
author:		Robert Vehse
date:		Thu Feb 23 19:42:55 2012 +0100

Bring some consistency to the naming of icons as suggested by Paul Wilde. Part 1: chat window toolbar icons. References #15789.

- letters all lower-case
- words are separated by hyphens
- "msg" indicates the icons are used (only) in the chat window

diffs (739 lines):

diff -r 9b4f5ee4a326 -r be874da9a68d Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj	Sun Feb 19 15:12:12 2012 +0200
+++ b/Adium.xcodeproj/project.pbxproj	Thu Feb 23 19:42:55 2012 +0100
@@ -148,7 +148,7 @@
 		117866E10EC759B9003E9B97 /* FTProgressResendPressed.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866DB0EC759B9003E9B97 /* FTProgressResendPressed.tif */; };
 		117866E20EC759B9003E9B97 /* FTProgressResendRollover_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866DC0EC759B9003E9B97 /* FTProgressResendRollover_Selected.tif */; };
 		117866E30EC759B9003E9B97 /* FTProgressResendRollover.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866DD0EC759B9003E9B97 /* FTProgressResendRollover.tif */; };
-		117D6DC00BC5F0C40080D02B /* notify.png in Resources */ = {isa = PBXBuildFile; fileRef = 117D6DBF0BC5F0C40080D02B /* notify.png */; };
+		117D6DC00BC5F0C40080D02B /* msg-request-attention.png in Resources */ = {isa = PBXBuildFile; fileRef = 117D6DBF0BC5F0C40080D02B /* msg-request-attention.png */; };
 		11819A1B10D0B95D003E8ECA /* AIMediaControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 11819A0910D0B90E003E8ECA /* AIMediaControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		11879C0B0F6FF4C400CACFB1 /* AITwitterAccountOAuthSetup.m in Sources */ = {isa = PBXBuildFile; fileRef = 11879C0A0F6FF4C400CACFB1 /* AITwitterAccountOAuthSetup.m */; };
 		11879DF80F6FFC0B00CACFB1 /* OAuthConsumer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 11879DF70F6FFC0B00CACFB1 /* OAuthConsumer.framework */; };
@@ -221,7 +221,7 @@
 		312ED3E20C7E8A0700A6BDA9 /* TestDateFormatterStringRepWithInterval.m in Sources */ = {isa = PBXBuildFile; fileRef = 312ED3E10C7E8A0700A6BDA9 /* TestDateFormatterStringRepWithInterval.m */; };
 		313C2F940D4B19B50032334D /* TestDictionaryAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 313C2F930D4B19B50032334D /* TestDictionaryAdditions.m */; };
 		31455C9A0CC353F800D231A0 /* TestDataAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 31455C990CC353F800D231A0 /* TestDataAdditions.m */; };
-		317D83680E89F40500298BDB /* bookmark_chat.png in Resources */ = {isa = PBXBuildFile; fileRef = 317D83670E89F40500298BDB /* bookmark_chat.png */; };
+		317D83680E89F40500298BDB /* msg-bookmark-chat.png in Resources */ = {isa = PBXBuildFile; fileRef = 317D83670E89F40500298BDB /* msg-bookmark-chat.png */; };
 		318EA69C0D7A659900EDB105 /* TestColorAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 318EA69B0D7A659900EDB105 /* TestColorAdditions.m */; };
 		319B29800CE8EC6F00C65398 /* TestDateAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 319B297F0CE8EC6E00C65398 /* TestDateAdditions.m */; };
 		31A764B90DA572B8000AC729 /* AutoHyperlinks.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3496A8EA07CE6CA30055BBAB /* AutoHyperlinks.framework */; };
@@ -254,15 +254,15 @@
 		3419DE730A81042F00C3FC68 /* AccountPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326107CBD598006466F2 /* AccountPrefs.plist */; };
 		3419DE740A81042F00C3FC68 /* BuiltInStatusStates.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8327507CBD5B3006466F2 /* BuiltInStatusStates.plist */; };
 		3419DE750A81042F00C3FC68 /* ContactPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326607CBD598006466F2 /* ContactPrefs.plist */; };
-		3419DE760A81042F00C3FC68 /* DefaultIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326707CBD598006466F2 /* DefaultIcon.png */; };
+		3419DE760A81042F00C3FC68 /* default-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326707CBD598006466F2 /* default-icon.png */; };
 		3419DE770A81042F00C3FC68 /* DockPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326207CBD598006466F2 /* DockPrefs.plist */; };
 		3419DE780A81042F00C3FC68 /* emoticon32.png in Resources */ = {isa = PBXBuildFile; fileRef = 3428B33E0815E1FB00C0D3DC /* emoticon32.png */; };
 		3419DE790A81042F00C3FC68 /* emoticon32_transparent.png in Resources */ = {isa = PBXBuildFile; fileRef = 345F590608199746001F733C /* emoticon32_transparent.png */; };
 		3419DE7A0A81042F00C3FC68 /* FontPanelAccessoryView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34B995D9092A832700E31E91 /* FontPanelAccessoryView.nib */; };
-		3419DE7C0A81042F00C3FC68 /* Lock_Locked State.png in Resources */ = {isa = PBXBuildFile; fileRef = 34DFF53007A62EB100B92233 /* Lock_Locked State.png */; };
-		3419DE7D0A81042F00C3FC68 /* Lock_Unlocked State.png in Resources */ = {isa = PBXBuildFile; fileRef = 34DFF52607A62EB000B92233 /* Lock_Unlocked State.png */; };
+		3419DE7C0A81042F00C3FC68 /* msg-lock-locked.png in Resources */ = {isa = PBXBuildFile; fileRef = 34DFF53007A62EB100B92233 /* msg-lock-locked.png */; };
+		3419DE7D0A81042F00C3FC68 /* msg-lock-unlocked.png in Resources */ = {isa = PBXBuildFile; fileRef = 34DFF52607A62EB000B92233 /* msg-lock-unlocked.png */; };
 		3419DE7E0A81042F00C3FC68 /* remove.png in Resources */ = {isa = PBXBuildFile; fileRef = 347E787507CA975900350507 /* remove.png */; };
-		3419DE7F0A81042F00C3FC68 /* sendfile.png in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326307CBD598006466F2 /* sendfile.png */; };
+		3419DE7F0A81042F00C3FC68 /* msg-send-file.png in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326307CBD598006466F2 /* msg-send-file.png */; };
 		3419DE820A81042F00C3FC68 /* ToolbarPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8327607CBD5B3006466F2 /* ToolbarPrefs.plist */; };
 		3419DF3B0A8119BF00C3FC68 /* AICalendarDate.m in Sources */ = {isa = PBXBuildFile; fileRef = 340D0A000A7DD1F40059A3AF /* AICalendarDate.m */; };
 		3419E2DF0A81445800C3FC68 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3419E2DE0A81445800C3FC68 /* Localizable.strings */; };
@@ -356,7 +356,7 @@
 		345F566B08178356001F733C /* AdiumServiceIcons.icns in Resources */ = {isa = PBXBuildFile; fileRef = 345F566A08178356001F733C /* AdiumServiceIcons.icns */; };
 		345F57400817FF80001F733C /* pref-contactList.png in Resources */ = {isa = PBXBuildFile; fileRef = 345F573F0817FF80001F733C /* pref-contactList.png */; };
 		345F583E08197E74001F733C /* AdiumStatusIcons.icns in Resources */ = {isa = PBXBuildFile; fileRef = 345F583D08197E74001F733C /* AdiumStatusIcons.icns */; };
-		345F58C7081990FF001F733C /* LogViewer.png in Resources */ = {isa = PBXBuildFile; fileRef = 345F58C6081990FF001F733C /* LogViewer.png */; };
+		345F58C7081990FF001F733C /* msg-log-viewer.png in Resources */ = {isa = PBXBuildFile; fileRef = 345F58C6081990FF001F733C /* msg-log-viewer.png */; };
 		34607EE909B228FE000DB3D2 /* AIContactListNameButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 34607EE709B228FE000DB3D2 /* AIContactListNameButton.m */; };
 		34607F1009B2296A000DB3D2 /* AIHoveringPopUpButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 34607F0C09B2296A000DB3D2 /* AIHoveringPopUpButtonCell.m */; };
 		34607F1209B2296A000DB3D2 /* AIHoveringPopUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 34607F0E09B2296A000DB3D2 /* AIHoveringPopUpButton.m */; };
@@ -392,7 +392,7 @@
 		347E39DC0A98AA4A00961B0E /* missing_image.png in Resources */ = {isa = PBXBuildFile; fileRef = 347E39DB0A98AA4A00961B0E /* missing_image.png */; };
 		347E77F407CA94FF00350507 /* ESAccountEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E77F207CA94FE00350507 /* ESAccountEvents.m */; };
 		347E781407CA961300350507 /* ESUserIconHandlingPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E781207CA961300350507 /* ESUserIconHandlingPlugin.m */; };
-		347E781A07CA962100350507 /* userIconToolbar.png in Resources */ = {isa = PBXBuildFile; fileRef = 347E781907CA962100350507 /* userIconToolbar.png */; };
+		347E781A07CA962100350507 /* msg-user-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 347E781907CA962100350507 /* msg-user-icon.png */; };
 		347E782907CA964600350507 /* AIContactSortSelectionPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E782507CA964600350507 /* AIContactSortSelectionPlugin.m */; };
 		347E782A07CA964700350507 /* ESContactSortConfigurationWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E782607CA964600350507 /* ESContactSortConfigurationWindowController.m */; };
 		347E783407CA967100350507 /* SortingDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 347E783307CA967100350507 /* SortingDefaults.plist */; };
@@ -401,7 +401,7 @@
 		347E786007CA970500350507 /* AINewGroupWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E785E07CA970500350507 /* AINewGroupWindowController.m */; };
 		347E786B07CA972100350507 /* AddContact.nib in Resources */ = {isa = PBXBuildFile; fileRef = 347E786907CA972100350507 /* AddContact.nib */; };
 		347E786C07CA972100350507 /* AddGroup.nib in Resources */ = {isa = PBXBuildFile; fileRef = 347E786A07CA972100350507 /* AddGroup.nib */; };
-		347E787807CA975900350507 /* AddContact.png in Resources */ = {isa = PBXBuildFile; fileRef = 347E787207CA975900350507 /* AddContact.png */; };
+		347E787807CA975900350507 /* msg-add-contact.png in Resources */ = {isa = PBXBuildFile; fileRef = 347E787207CA975900350507 /* msg-add-contact.png */; };
 		347E788907CA978E00350507 /* CBActionSupportPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E788707CA978D00350507 /* CBActionSupportPlugin.m */; };
 		347E791307CAA51500350507 /* AIManualSort.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E790D07CAA51400350507 /* AIManualSort.m */; };
 		347E791507CAA51500350507 /* ESStatusSort.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E790F07CAA51400350507 /* ESStatusSort.m */; };
@@ -630,7 +630,7 @@
 		34BD9D54053146CC000AB133 /* AIAdium.m in Sources */ = {isa = PBXBuildFile; fileRef = F59DB3D7033EA9CD01A8010A /* AIAdium.m */; };
 		34BD9D56053146CC000AB133 /* LNAboutBoxController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3DA2E3E052E65DE00A8010B /* LNAboutBoxController.m */; };
 		34BD9D5A053146CC000AB133 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F531836F019E40BB01A80165 /* Carbon.framework */; };
-		34BFD7FD07E6A50C00AD984D /* scriptToolbar.png in Resources */ = {isa = PBXBuildFile; fileRef = 34BFD7FC07E6A50C00AD984D /* scriptToolbar.png */; };
+		34BFD7FD07E6A50C00AD984D /* msg-insert-script.png in Resources */ = {isa = PBXBuildFile; fileRef = 34BFD7FC07E6A50C00AD984D /* msg-insert-script.png */; };
 		34BFD80007E6A51D00AD984D /* GBApplescriptFiltersPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BFD7FE07E6A51D00AD984D /* GBApplescriptFiltersPlugin.m */; };
 		34BFDF1807E8977D00AD984D /* SoundHigh.png in Resources */ = {isa = PBXBuildFile; fileRef = 34BFDF1607E8977D00AD984D /* SoundHigh.png */; };
 		34BFDF1907E8977D00AD984D /* SoundLow.png in Resources */ = {isa = PBXBuildFile; fileRef = 34BFDF1707E8977D00AD984D /* SoundLow.png */; };
@@ -1025,7 +1025,7 @@
 		4B191D8B0611C10800E8A4E7 /* ReadMe.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 4B191D890611C10800E8A4E7 /* ReadMe.rtf */; };
 		4B7A567B07A1754400BDC540 /* AIEditAccountWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B7A567807A1754400BDC540 /* AIEditAccountWindowController.m */; };
 		4B909C8A064D75400074C9A8 /* BGEmoticonMenuPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = C4243C930638E4EA007AD2D9 /* BGEmoticonMenuPlugin.m */; };
-		4B97DB6706AC123A0003EE49 /* linkToolbar.png in Resources */ = {isa = PBXBuildFile; fileRef = 4B97DB6606AC123A0003EE49 /* linkToolbar.png */; };
+		4B97DB6706AC123A0003EE49 /* msg-insert-link.png in Resources */ = {isa = PBXBuildFile; fileRef = 4B97DB6606AC123A0003EE49 /* msg-insert-link.png */; };
 		4BA62D8E06C51257001D6B3C /* Status Icons in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 4BA62D7F06C51256001D6B3C /* Status Icons */; };
 		4BAA1B530632EF0000D8B92C /* ErrorAlert.png in Resources */ = {isa = PBXBuildFile; fileRef = 4BAA1B500632EF0000D8B92C /* ErrorAlert.png */; };
 		4BAA1B550632EF0000D8B92C /* ESPanelAlertDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAA1B520632EF0000D8B92C /* ESPanelAlertDetailPane.m */; };
@@ -1397,7 +1397,7 @@
 		6EC1684F06C170A000F9FAD3 /* DCInviteToChatWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684A06C170A000F9FAD3 /* DCInviteToChatWindowController.m */; };
 		6EC1685006C170A000F9FAD3 /* InviteToChatWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 6EC1684B06C170A000F9FAD3 /* InviteToChatWindow.nib */; };
 		766ABAB61306D1020049FFB7 /* AIUnreadMessagesTooltip.m in Sources */ = {isa = PBXBuildFile; fileRef = 766ABAB51306D1020049FFB7 /* AIUnreadMessagesTooltip.m */; };
-		76889DEB12D3CA17007AEF00 /* GetInfo.png in Resources */ = {isa = PBXBuildFile; fileRef = 76889DEA12D3CA17007AEF00 /* GetInfo.png */; };
+		76889DEB12D3CA17007AEF00 /* get-info.png in Resources */ = {isa = PBXBuildFile; fileRef = 76889DEA12D3CA17007AEF00 /* get-info.png */; };
 		76889DEF12D3CA40007AEF00 /* Personal.png in Resources */ = {isa = PBXBuildFile; fileRef = 76889DEE12D3CA40007AEF00 /* Personal.png */; };
 		76C1AF9C125A906A00D269A9 /* AIAdiumURLProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 76C1AF9B125A906A00D269A9 /* AIAdiumURLProtocol.m */; };
 		7E6F8A94105611B700C6D80D /* libotr.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E6F8A93105611B700C6D80D /* libotr.framework */; };
@@ -1463,13 +1463,13 @@
 		9E217B7B06A74CA8002A3F27 /* StatusMenuItemDefaultPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9E217B7706A74CA7002A3F27 /* StatusMenuItemDefaultPrefs.plist */; };
 		9ECB03E709F2A9D900996F44 /* AIDictionaryDebug.m in Sources */ = {isa = PBXBuildFile; fileRef = 9ECB03E309F2A9D800996F44 /* AIDictionaryDebug.m */; };
 		9ECB03E909F2A9D900996F44 /* AIXMLAppender.m in Sources */ = {isa = PBXBuildFile; fileRef = 9ECB03E509F2A9D800996F44 /* AIXMLAppender.m */; };
-		9EF0DBFA09D944C200FBCC1E /* Resources/block.png in Resources */ = {isa = PBXBuildFile; fileRef = 9EF0DBF309D944A300FBCC1E /* Resources/block.png */; };
-		9EF0DBFB09D944C200FBCC1E /* Resources/unblock.png in Resources */ = {isa = PBXBuildFile; fileRef = 9EF0DBF409D944A300FBCC1E /* Resources/unblock.png */; };
+		9EF0DBFA09D944C200FBCC1E /* msg-block-contact.png in Resources */ = {isa = PBXBuildFile; fileRef = 9EF0DBF309D944A300FBCC1E /* msg-block-contact.png */; };
+		9EF0DBFB09D944C200FBCC1E /* msg-unblock-contact.png in Resources */ = {isa = PBXBuildFile; fileRef = 9EF0DBF409D944A300FBCC1E /* msg-unblock-contact.png */; };
 		C44BA7830AAB696400C7504F /* SetupAssistantBoxBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = C44BA7810AAB696400C7504F /* SetupAssistantBoxBackgroundView.m */; };
 		C4D29CC40C3C2E3C001545A2 /* BGICImportController.m in Sources */ = {isa = PBXBuildFile; fileRef = C4D29CC00C3C2E3C001545A2 /* BGICImportController.m */; };
 		C4D29CC60C3C2E3C001545A2 /* BGICLogImportController.m in Sources */ = {isa = PBXBuildFile; fileRef = C4D29CC20C3C2E3C001545A2 /* BGICLogImportController.m */; };
 		C4D29CC80C3C2E49001545A2 /* ICImport.nib in Resources */ = {isa = PBXBuildFile; fileRef = C4D29CC70C3C2E49001545A2 /* ICImport.nib */; };
-		D10A3A2B122C61EF003B5A7E /* source-destination.png in Resources */ = {isa = PBXBuildFile; fileRef = D10A3A2A122C61EF003B5A7E /* source-destination.png */; };
+		D10A3A2B122C61EF003B5A7E /* msg-source-destination.png in Resources */ = {isa = PBXBuildFile; fileRef = D10A3A2A122C61EF003B5A7E /* msg-source-destination.png */; };
 		EE147A6D0896B18800A21377 /* ABSearch.png in Resources */ = {isa = PBXBuildFile; fileRef = EE147A6C0896B18700A21377 /* ABSearch.png */; };
 		EE147A790896B32400A21377 /* ABSearch.nib in Resources */ = {isa = PBXBuildFile; fileRef = EE147A780896B32400A21377 /* ABSearch.nib */; };
 		EE147A800896B33400A21377 /* OWABSearchWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = EE147A7E0896B33400A21377 /* OWABSearchWindowController.m */; };
@@ -1899,7 +1899,7 @@
 		117866DB0EC759B9003E9B97 /* FTProgressResendPressed.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressResendPressed.tif; path = Resources/FTProgressResendPressed.tif; sourceTree = "<group>"; };
 		117866DC0EC759B9003E9B97 /* FTProgressResendRollover_Selected.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressResendRollover_Selected.tif; path = Resources/FTProgressResendRollover_Selected.tif; sourceTree = "<group>"; };
 		117866DD0EC759B9003E9B97 /* FTProgressResendRollover.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressResendRollover.tif; path = Resources/FTProgressResendRollover.tif; sourceTree = "<group>"; };
-		117D6DBF0BC5F0C40080D02B /* notify.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = notify.png; path = Resources/notify.png; sourceTree = SOURCE_ROOT; };
+		117D6DBF0BC5F0C40080D02B /* msg-request-attention.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "msg-request-attention.png"; path = "Resources/msg-request-attention.png"; sourceTree = SOURCE_ROOT; };
 		1181981210D0B17C003E8ECA /* adiumPurpleMedia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = adiumPurpleMedia.h; path = "Plugins/Purple Service/adiumPurpleMedia.h"; sourceTree = "<group>"; };
 		118199C410D0B65A003E8ECA /* AIMedia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIMedia.h; path = "Frameworks/Adium Framework/Source/AIMedia.h"; sourceTree = "<group>"; };
 		118199C510D0B65A003E8ECA /* AIMedia.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIMedia.m; path = "Frameworks/Adium Framework/Source/AIMedia.m"; sourceTree = "<group>"; };
@@ -2025,7 +2025,7 @@
 		313C2F930D4B19B50032334D /* TestDictionaryAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TestDictionaryAdditions.m; path = UnitTests/TestDictionaryAdditions.m; sourceTree = "<group>"; };
 		31455C980CC353F800D231A0 /* TestDataAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestDataAdditions.h; path = UnitTests/TestDataAdditions.h; sourceTree = "<group>"; };
 		31455C990CC353F800D231A0 /* TestDataAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TestDataAdditions.m; path = UnitTests/TestDataAdditions.m; sourceTree = "<group>"; };
-		317D83670E89F40500298BDB /* bookmark_chat.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bookmark_chat.png; path = Resources/bookmark_chat.png; sourceTree = "<group>"; };
+		317D83670E89F40500298BDB /* msg-bookmark-chat.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "msg-bookmark-chat.png"; path = "Resources/msg-bookmark-chat.png"; sourceTree = "<group>"; };
 		318EA69A0D7A659900EDB105 /* TestColorAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestColorAdditions.h; path = UnitTests/TestColorAdditions.h; sourceTree = "<group>"; };
 		318EA69B0D7A659900EDB105 /* TestColorAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TestColorAdditions.m; path = UnitTests/TestColorAdditions.m; sourceTree = "<group>"; };
 		319B29420CE8D28300C65398 /* TestDateAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestDateAdditions.h; path = UnitTests/TestDateAdditions.h; sourceTree = "<group>"; };
@@ -2801,7 +2801,7 @@
 		345F589A08198F15001F733C /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = de; path = Resources/de.lproj/ListThemeSheet.nib; sourceTree = "<group>"; };
 		345F589B08198F15001F733C /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = de; path = Resources/de.lproj/AppearancePrefs.nib; sourceTree = "<group>"; };
 		345F589C08198F15001F733C /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = de; path = Resources/de.lproj/StatusSortConfiguration.nib; sourceTree = "<group>"; };
-		345F58C6081990FF001F733C /* LogViewer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = LogViewer.png; path = Resources/LogViewer.png; sourceTree = "<group>"; };
+		345F58C6081990FF001F733C /* msg-log-viewer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "msg-log-viewer.png"; path = "Resources/msg-log-viewer.png"; sourceTree = "<group>"; };
 		345F590608199746001F733C /* emoticon32_transparent.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = emoticon32_transparent.png; path = Resources/emoticon32_transparent.png; sourceTree = "<group>"; };
 		345F5B97081AC4F1001F733C /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = zh_TW; path = Resources/zh_TW.lproj/AccountProxy.nib; sourceTree = "<group>"; };
 		345F5B98081AC4F1001F733C /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = zh_TW; path = Resources/zh_TW.lproj/AppearancePrefs.nib; sourceTree = "<group>"; };
@@ -3029,7 +3029,7 @@
 		347E77F207CA94FE00350507 /* ESAccountEvents.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESAccountEvents.m; path = Source/ESAccountEvents.m; sourceTree = "<group>"; };
 		347E781107CA961300350507 /* ESUserIconHandlingPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESUserIconHandlingPlugin.h; path = Source/ESUserIconHandlingPlugin.h; sourceTree = "<group>"; };
 		347E781207CA961300350507 /* ESUserIconHandlingPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESUserIconHandlingPlugin.m; path = Source/ESUserIconHandlingPlugin.m; sourceTree = "<group>"; };
-		347E781907CA962100350507 /* userIconToolbar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = userIconToolbar.png; path = Resources/userIconToolbar.png; sourceTree = "<group>"; };
+		347E781907CA962100350507 /* msg-user-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "msg-user-icon.png"; path = "Resources/msg-user-icon.png"; sourceTree = "<group>"; };
 		347E782407CA964600350507 /* ESContactSortConfigurationWindowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESContactSortConfigurationWindowController.h; path = Source/ESContactSortConfigurationWindowController.h; sourceTree = "<group>"; };
 		347E782507CA964600350507 /* AIContactSortSelectionPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIContactSortSelectionPlugin.m; path = Source/AIContactSortSelectionPlugin.m; sourceTree = "<group>"; };
 		347E782607CA964600350507 /* ESContactSortConfigurationWindowController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESContactSortConfigurationWindowController.m; path = Source/ESContactSortConfigurationWindowController.m; sourceTree = "<group>"; };
@@ -3043,7 +3043,7 @@
 		347E785F07CA970500350507 /* AINewGroupWindowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AINewGroupWindowController.h; path = Source/AINewGroupWindowController.h; sourceTree = "<group>"; };
 		347E786907CA972100350507 /* AddContact.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = AddContact.nib; path = Resources/AddContact.nib; sourceTree = "<group>"; };
 		347E786A07CA972100350507 /* AddGroup.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = AddGroup.nib; path = Resources/AddGroup.nib; sourceTree = "<group>"; };
-		347E787207CA975900350507 /* AddContact.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AddContact.png; path = Resources/AddContact.png; sourceTree = "<group>"; };
+		347E787207CA975900350507 /* msg-add-contact.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "msg-add-contact.png"; path = "Resources/msg-add-contact.png"; sourceTree = "<group>"; };
 		347E787507CA975900350507 /* remove.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = remove.png; path = Resources/remove.png; sourceTree = "<group>"; };
 		347E787607CA975900350507 /* importContacts.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = importContacts.png; path = Resources/importContacts.png; sourceTree = "<group>"; };
 		347E788707CA978D00350507 /* CBActionSupportPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = CBActionSupportPlugin.m; path = Source/CBActionSupportPlugin.m; sourceTree = "<group>"; };
@@ -3466,7 +3466,7 @@
 		34BFD7F207E6A22700AD984D /* ESPresetManagementController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESPresetManagementController.h; path = "Frameworks/Adium Framework/Source/ESPresetManagementController.h"; sourceTree = "<group>"; };
 		34BFD7F307E6A22700AD984D /* PresetManagement.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = PresetManagement.nib; path = "Frameworks/Adium Framework/Resources/PresetManagement.nib"; sourceTree = "<group>"; };
 		34BFD7F407E6A22700AD984D /* ESPresetManagementController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESPresetManagementController.m; path = "Frameworks/Adium Framework/Source/ESPresetManagementController.m"; sourceTree = "<group>"; };
-		34BFD7FC07E6A50C00AD984D /* scriptToolbar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = scriptToolbar.png; path = Resources/scriptToolbar.png; sourceTree = "<group>"; };
+		34BFD7FC07E6A50C00AD984D /* msg-insert-script.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "msg-insert-script.png"; path = "Resources/msg-insert-script.png"; sourceTree = "<group>"; };
 		34BFD7FE07E6A51D00AD984D /* GBApplescriptFiltersPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = GBApplescriptFiltersPlugin.m; path = Source/GBApplescriptFiltersPlugin.m; sourceTree = "<group>"; };
 		34BFD7FF07E6A51D00AD984D /* GBApplescriptFiltersPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = GBApplescriptFiltersPlugin.h; path = Source/GBApplescriptFiltersPlugin.h; sourceTree = "<group>"; };
 		34BFDB2C07E7710C00AD984D /* ESPresetNameSheetController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESPresetNameSheetController.h; path = "Frameworks/Adium Framework/Source/ESPresetNameSheetController.h"; sourceTree = "<group>"; };
@@ -3614,10 +3614,10 @@
 		34D8325307CBD53B006466F2 /* FTProgressRevealPressed_Selected.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressRevealPressed_Selected.tif; path = Resources/FTProgressRevealPressed_Selected.tif; sourceTree = "<group>"; };
 		34D8326107CBD598006466F2 /* AccountPrefs.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = AccountPrefs.plist; path = Resources/AccountPrefs.plist; sourceTree = "<group>"; };
 		34D8326207CBD598006466F2 /* DockPrefs.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = DockPrefs.plist; path = Resources/DockPrefs.plist; sourceTree = "<group>"; };
-		34D8326307CBD598006466F2 /* sendfile.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = sendfile.png; path = Resources/sendfile.png; sourceTree = "<group>"; };
+		34D8326307CBD598006466F2 /* msg-send-file.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "msg-send-file.png"; path = "Resources/msg-send-file.png"; sourceTree = "<group>"; };
 		34D8326407CBD598006466F2 /* SoundPrefs.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = SoundPrefs.plist; path = Resources/SoundPrefs.plist; sourceTree = "<group>"; };
 		34D8326607CBD598006466F2 /* ContactPrefs.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = ContactPrefs.plist; path = Resources/ContactPrefs.plist; sourceTree = "<group>"; };
-		34D8326707CBD598006466F2 /* DefaultIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DefaultIcon.png; path = Resources/DefaultIcon.png; sourceTree = "<group>"; };
+		34D8326707CBD598006466F2 /* default-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "default-icon.png"; path = "Resources/default-icon.png"; sourceTree = "<group>"; };
 		34D8327507CBD5B3006466F2 /* BuiltInStatusStates.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = BuiltInStatusStates.plist; path = Resources/BuiltInStatusStates.plist; sourceTree = "<group>"; };
 		34D8327607CBD5B3006466F2 /* ToolbarPrefs.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = ToolbarPrefs.plist; path = Resources/ToolbarPrefs.plist; sourceTree = "<group>"; };
 		34D8329F07CBD61A006466F2 /* ContactListDefaults.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = ContactListDefaults.plist; path = Resources/ContactListDefaults.plist; sourceTree = "<group>"; };
@@ -3648,8 +3648,8 @@
 		34DC84280A7EA012003E1636 /* nl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = nl; path = Resources/nl.lproj/ESFileTransferProgressView.nib; sourceTree = "<group>"; };
 		34DFF46007A5EABF00B92233 /* ESSecureMessagingPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESSecureMessagingPlugin.h; path = "Plugins/Secure Messaging/ESSecureMessagingPlugin.h"; sourceTree = "<group>"; };
 		34DFF46107A5EABF00B92233 /* ESSecureMessagingPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESSecureMessagingPlugin.m; path = "Plugins/Secure Messaging/ESSecureMessagingPlugin.m"; sourceTree = "<group>"; };
-		34DFF52607A62EB000B92233 /* Lock_Unlocked State.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Lock_Unlocked State.png"; path = "Plugins/Secure Messaging/Lock_Unlocked State.png"; sourceTree = "<group>"; };
-		34DFF53007A62EB100B92233 /* Lock_Locked State.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Lock_Locked State.png"; path = "Plugins/Secure Messaging/Lock_Locked State.png"; sourceTree = "<group>"; };
+		34DFF52607A62EB000B92233 /* msg-lock-unlocked.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "msg-lock-unlocked.png"; path = "Plugins/Secure Messaging/msg-lock-unlocked.png"; sourceTree = "<group>"; };
+		34DFF53007A62EB100B92233 /* msg-lock-locked.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "msg-lock-locked.png"; path = "Plugins/Secure Messaging/msg-lock-locked.png"; sourceTree = "<group>"; };
 		34E00F7407B92B2E000DF265 /* ESTextAndButtonsWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESTextAndButtonsWindowController.h; path = "Frameworks/Adium Framework/Source/ESTextAndButtonsWindowController.h"; sourceTree = "<group>"; };
 		34E00F7507B92B2F000DF265 /* ESTextAndButtonsWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESTextAndButtonsWindowController.m; path = "Frameworks/Adium Framework/Source/ESTextAndButtonsWindowController.m"; sourceTree = "<group>"; };
 		34E00F8607B92B88000DF265 /* TextAndButtonsWindow.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = TextAndButtonsWindow.nib; path = "Frameworks/Adium Framework/Resources/TextAndButtonsWindow.nib"; sourceTree = "<group>"; };
@@ -3937,7 +3937,7 @@
 		4B93588F06DBC71B007977AA /* AIStatusIcons.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIStatusIcons.h; path = "Frameworks/Adium Framework/Source/AIStatusIcons.h"; sourceTree = "<group>"; };
 		4B970BF80535B864002F28F9 /* ESDualWindowMessageAdvancedPreferences.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESDualWindowMessageAdvancedPreferences.h; path = "Plugins/Dual Window Interface/ESDualWindowMessageAdvancedPreferences.h"; sourceTree = "<group>"; };
 		4B970BF90535B864002F28F9 /* ESDualWindowMessageAdvancedPreferences.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESDualWindowMessageAdvancedPreferences.m; path = "Plugins/Dual Window Interface/ESDualWindowMessageAdvancedPreferences.m"; sourceTree = "<group>"; };
-		4B97DB6606AC123A0003EE49 /* linkToolbar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = linkToolbar.png; path = Resources/linkToolbar.png; sourceTree = SOURCE_ROOT; };
+		4B97DB6606AC123A0003EE49 /* msg-insert-link.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "msg-insert-link.png"; path = "Resources/msg-insert-link.png"; sourceTree = SOURCE_ROOT; };
 		4BA5325D050FC5E800A8010A /* EventSoundDefaults.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = EventSoundDefaults.plist; path = Resources/EventSoundDefaults.plist; sourceTree = "<group>"; };
 		4BA62D7F06C51256001D6B3C /* Status Icons */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "Status Icons"; path = "Resources/Status Icons"; sourceTree = "<group>"; };
 		4BAA1B350632ED8B00D8B92C /* AIActionDetailsPane.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIActionDetailsPane.h; path = "Frameworks/Adium Framework/Source/AIActionDetailsPane.h"; sourceTree = "<group>"; };
@@ -4574,7 +4574,7 @@
 		6FB330A40C7235BF00B001A8 /* EKEzvOutgoingFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = EKEzvOutgoingFileTransfer.m; path = Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.m; sourceTree = SOURCE_ROOT; };
 		766ABAB41306D1020049FFB7 /* AIUnreadMessagesTooltip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIUnreadMessagesTooltip.h; path = Source/AIUnreadMessagesTooltip.h; sourceTree = "<group>"; };
 		766ABAB51306D1020049FFB7 /* AIUnreadMessagesTooltip.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIUnreadMessagesTooltip.m; path = Source/AIUnreadMessagesTooltip.m; sourceTree = "<group>"; };
-		76889DEA12D3CA17007AEF00 /* GetInfo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = GetInfo.png; path = Resources/GetInfo.png; sourceTree = "<group>"; };
+		76889DEA12D3CA17007AEF00 /* get-info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "get-info.png"; path = "Resources/get-info.png"; sourceTree = "<group>"; };
 		76889DEE12D3CA40007AEF00 /* Personal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Personal.png; path = Resources/Personal.png; sourceTree = "<group>"; };
 		76C1AF9A125A906A00D269A9 /* AIAdiumURLProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIAdiumURLProtocol.h; path = "Plugins/WebKit Message View/AIAdiumURLProtocol.h"; sourceTree = "<group>"; };
 		76C1AF9B125A906A00D269A9 /* AIAdiumURLProtocol.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIAdiumURLProtocol.m; path = "Plugins/WebKit Message View/AIAdiumURLProtocol.m"; sourceTree = "<group>"; };
@@ -4667,8 +4667,8 @@
 		9ECB03E309F2A9D800996F44 /* AIDictionaryDebug.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIDictionaryDebug.m; path = Source/AIDictionaryDebug.m; sourceTree = "<group>"; };
 		9ECB03E409F2A9D800996F44 /* AIXMLAppender.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIXMLAppender.h; path = Source/AIXMLAppender.h; sourceTree = "<group>"; };
 		9ECB03E509F2A9D800996F44 /* AIXMLAppender.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIXMLAppender.m; path = Source/AIXMLAppender.m; sourceTree = "<group>"; };
-		9EF0DBF309D944A300FBCC1E /* Resources/block.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Resources/block.png; sourceTree = "<group>"; };
-		9EF0DBF409D944A300FBCC1E /* Resources/unblock.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Resources/unblock.png; sourceTree = "<group>"; };
+		9EF0DBF309D944A300FBCC1E /* msg-block-contact.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "msg-block-contact.png"; path = "Resources/msg-block-contact.png"; sourceTree = "<group>"; };
+		9EF0DBF409D944A300FBCC1E /* msg-unblock-contact.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "msg-unblock-contact.png"; path = "Resources/msg-unblock-contact.png"; sourceTree = "<group>"; };
 		A3C042D108D7483100B48CE1 /* PurpleDefaultsGTalk.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = PurpleDefaultsGTalk.plist; path = "Plugins/Purple Service/PurpleDefaultsGTalk.plist"; sourceTree = "<group>"; };
 		A3C0431B08D74D3100B48CE1 /* AIPurpleGTalkAccount.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIPurpleGTalkAccount.h; path = "Plugins/Purple Service/AIPurpleGTalkAccount.h"; sourceTree = "<group>"; };
 		A3C0431C08D74D3100B48CE1 /* AIPurpleGTalkAccount.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIPurpleGTalkAccount.m; path = "Plugins/Purple Service/AIPurpleGTalkAccount.m"; sourceTree = "<group>"; };
@@ -4685,7 +4685,7 @@
 		C4D29CC10C3C2E3C001545A2 /* BGICLogImportController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = BGICLogImportController.h; path = Source/BGICLogImportController.h; sourceTree = SOURCE_ROOT; };
 		C4D29CC20C3C2E3C001545A2 /* BGICLogImportController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = BGICLogImportController.m; path = Source/BGICLogImportController.m; sourceTree = SOURCE_ROOT; };
 		C4D29CC70C3C2E49001545A2 /* ICImport.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ICImport.nib; path = Resources/ICImport.nib; sourceTree = SOURCE_ROOT; };
-		D10A3A2A122C61EF003B5A7E /* source-destination.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "source-destination.png"; path = "Resources/source-destination.png"; sourceTree = "<group>"; };
+		D10A3A2A122C61EF003B5A7E /* msg-source-destination.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "msg-source-destination.png"; path = "Resources/msg-source-destination.png"; sourceTree = "<group>"; };
 		D182F1B411DFF23700E33AE2 /* sk_SK */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sk_SK; path = sk_SK.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		D182F1B611DFF23700E33AE2 /* sk_SK */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sk_SK; path = sk_SK.lproj/schema.strings; sourceTree = "<group>"; };
 		D1B9BFFE14C3ADAE00D03244 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/Purple Service/Resources/sl.lproj/ESPurpleZephyrAccountView.nib"; sourceTree = "<group>"; };
@@ -5094,7 +5094,7 @@
 		11C7CAEF0BB58F4100296D7F /* Nudge and Buzz Handler */ = {
 			isa = PBXGroup;
 			children = (
-				117D6DBF0BC5F0C40080D02B /* notify.png */,
+				117D6DBF0BC5F0C40080D02B /* msg-request-attention.png */,
 				11C7CAF00BB58F4100296D7F /* AINudgeBuzzHandlerPlugin.h */,
 				11C7CAF10BB58F4100296D7F /* AINudgeBuzzHandlerPlugin.m */,
 			);
@@ -5267,7 +5267,7 @@
 			children = (
 				347E781107CA961300350507 /* ESUserIconHandlingPlugin.h */,
 				347E781207CA961300350507 /* ESUserIconHandlingPlugin.m */,
-				347E781907CA962100350507 /* userIconToolbar.png */,
+				347E781907CA962100350507 /* msg-user-icon.png */,
 			);
 			name = "User Icon Handling";
 			sourceTree = "<group>";
@@ -6251,8 +6251,8 @@
 			isa = PBXGroup;
 			children = (
 				110763F908676D04005987A5 /* BlockEditorWindow.nib */,
-				9EF0DBF309D944A300FBCC1E /* Resources/block.png */,
-				9EF0DBF409D944A300FBCC1E /* Resources/unblock.png */,
+				9EF0DBF309D944A300FBCC1E /* msg-block-contact.png */,
+				9EF0DBF409D944A300FBCC1E /* msg-unblock-contact.png */,
 				110763F108676CC9005987A5 /* RAFBlockEditorPlugin.h */,
 				110763F208676CC9005987A5 /* RAFBlockEditorPlugin.m */,
 				110763F308676CC9005987A5 /* RAFBlockEditorWindowController.h */,
@@ -6530,18 +6530,18 @@
 			isa = PBXGroup;
 			children = (
 				34D8326107CBD598006466F2 /* AccountPrefs.plist */,
-				317D83670E89F40500298BDB /* bookmark_chat.png */,
+				317D83670E89F40500298BDB /* msg-bookmark-chat.png */,
 				34D8327507CBD5B3006466F2 /* BuiltInStatusStates.plist */,
 				34D8326607CBD598006466F2 /* ContactPrefs.plist */,
-				34D8326707CBD598006466F2 /* DefaultIcon.png */,
+				34D8326707CBD598006466F2 /* default-icon.png */,
 				34D8326207CBD598006466F2 /* DockPrefs.plist */,
 				3428B33E0815E1FB00C0D3DC /* emoticon32.png */,
 				345F590608199746001F733C /* emoticon32_transparent.png */,
 				34B995D9092A832700E31E91 /* FontPanelAccessoryView.nib */,
-				34DFF53007A62EB100B92233 /* Lock_Locked State.png */,
-				34DFF52607A62EB000B92233 /* Lock_Unlocked State.png */,
+				34DFF53007A62EB100B92233 /* msg-lock-locked.png */,
+				34DFF52607A62EB000B92233 /* msg-lock-unlocked.png */,
 				347E787507CA975900350507 /* remove.png */,
-				34D8326307CBD598006466F2 /* sendfile.png */,
+				34D8326307CBD598006466F2 /* msg-send-file.png */,
 				4BB2EB200D88D76100CA7A7D /* timestamp32.png */,
 				4BB2EB210D88D76100CA7A7D /* timestamp32_transparent.png */,
 				34D8327607CBD5B3006466F2 /* ToolbarPrefs.plist */,
@@ -6637,7 +6637,7 @@
 			children = (
 				34BFD7FF07E6A51D00AD984D /* GBApplescriptFiltersPlugin.h */,
 				34BFD7FE07E6A51D00AD984D /* GBApplescriptFiltersPlugin.m */,
-				34BFD7FC07E6A50C00AD984D /* scriptToolbar.png */,
+				34BFD7FC07E6A50C00AD984D /* msg-insert-script.png */,
 			);
 			name = "Applescript Filters";
 			sourceTree = "<group>";
@@ -8230,7 +8230,7 @@
 		7E824CCD06387FAF00813072 /* Link Management */ = {
 			isa = PBXGroup;
 			children = (
-				4B97DB6606AC123A0003EE49 /* linkToolbar.png */,
+				4B97DB6606AC123A0003EE49 /* msg-insert-link.png */,
 				1163F0EA0F6C7A8300F12F5D /* AIURLShortenerPlugin.h */,
 				1163F0EB0F6C7A8300F12F5D /* AIURLShortenerPlugin.m */,
 				7E824CDB06387FAF00813072 /* SHLinkManagementPlugin.h */,
@@ -8344,7 +8344,7 @@
 		9C82689903D9B23F00F1D4AF /* Icons */ = {
 			isa = PBXGroup;
 			children = (
-				D10A3A2A122C61EF003B5A7E /* source-destination.png */,
+				D10A3A2A122C61EF003B5A7E /* msg-source-destination.png */,
 				4BF3CBEC07D192F500A8112A /* pref-accounts.png */,
 				34D8336E07CBD807006466F2 /* pref-advanced.png */,
 				4BF3CB4107D1771E00A8112A /* pref-appearance.png */,
@@ -8384,7 +8384,7 @@
 				4BE666CC0577AFA0007E115C /* Log Viewer */,
 				3456233E0A3773D000E7FC97 /* AILoggerPlugin.h */,
 				3456233D0A3773D000E7FC97 /* AILoggerPlugin.m */,
-				345F58C6081990FF001F733C /* LogViewer.png */,
+				345F58C6081990FF001F733C /* msg-log-viewer.png */,
 				345623370A3773C300E7FC97 /* LoggingDefaults.plist */,
 			);
 			name = Logger;
@@ -8605,7 +8605,7 @@
 				349710DB096C4C7700699948 /* Buttons.strings */,
 				07E179770C657B5E005DDA3D /* ConfirmationDefaults.plist */,
 				34D8326607CBD598006466F2 /* ContactPrefs.plist */,
-				34D8326707CBD598006466F2 /* DefaultIcon.png */,
+				34D8326707CBD598006466F2 /* default-icon.png */,
 				63C120740910A0DD00C9DB57 /* DefaultXtraReadme.rtf */,
 				34D8326207CBD598006466F2 /* DockPrefs.plist */,
 				34B995D9092A832700E31E91 /* FontPanelAccessoryView.nib */,
@@ -8615,7 +8615,7 @@
 				F59DB6AD033EB74801A8010A /* main.m */,
 				34575E3807CBA88E004A4FFF /* MainMenu.xib */,
 				4B191D890611C10800E8A4E7 /* ReadMe.rtf */,
-				34D8326307CBD598006466F2 /* sendfile.png */,
+				34D8326307CBD598006466F2 /* msg-send-file.png */,
 				345DA0660CA09AD0009F1989 /* Statuses.strings */,
 				34D8327607CBD5B3006466F2 /* ToolbarPrefs.plist */,
 			);
@@ -8716,7 +8716,7 @@
 			isa = PBXGroup;
 			children = (
 				EE147A6C0896B18700A21377 /* ABSearch.png */,
-				347E787207CA975900350507 /* AddContact.png */,
+				347E787207CA975900350507 /* msg-add-contact.png */,
 				347E787607CA975900350507 /* importContacts.png */,
 			);
 			name = Images;
@@ -8915,7 +8915,7 @@
 				4F1CB63C0D640DA40073A1E6 /* advanced_segment.png */,
 				4F1CB63D0D640DA40073A1E6 /* events_segment.png */,
 				346196F10D31607500763051 /* SRSnapback.png */,
-				76889DEA12D3CA17007AEF00 /* GetInfo.png */,
+				76889DEA12D3CA17007AEF00 /* get-info.png */,
 			);
 			name = "Contact Info Window";
 			sourceTree = "<group>";
@@ -9683,16 +9683,16 @@
 				6318DBA40F8D93F200C5E584 /* SoulEdge.png in Resources */,
 				6318DBA50F8D93F200C5E584 /* terminator.png in Resources */,
 				6318DBA60F8D93F200C5E584 /* Template.html in Resources */,
-				9EF0DBFA09D944C200FBCC1E /* Resources/block.png in Resources */,
-				9EF0DBFB09D944C200FBCC1E /* Resources/unblock.png in Resources */,
+				9EF0DBFA09D944C200FBCC1E /* msg-block-contact.png in Resources */,
+				9EF0DBFB09D944C200FBCC1E /* msg-unblock-contact.png in Resources */,
 				346F5D3208A43E7B0055C610 /* CurrentTunes.scpt in Resources */,
 				349C30790867ADA3000BF883 /* AdiumApplescriptRunner in Resources */,
 				349C7C7A07C9AE1B005EB896 /* ContactListAdvancedPrefs.nib in Resources */,
 				34E0EA0807CC53ED00A82198 /* NewMessagePrompt.nib in Resources */,
-				347E781A07CA962100350507 /* userIconToolbar.png in Resources */,
+				347E781A07CA962100350507 /* msg-user-icon.png in Resources */,
 				347E783407CA967100350507 /* SortingDefaults.plist in Resources */,
 				347E786C07CA972100350507 /* AddGroup.nib in Resources */,
-				347E787807CA975900350507 /* AddContact.png in Resources */,
+				347E787807CA975900350507 /* msg-add-contact.png in Resources */,
 				347E792307CAA52300350507 /* StatusSortDefaults.plist in Resources */,
 				343EB41708086D9100E27095 /* StatusSortConfiguration.nib in Resources */,
 				347E792507CAA52300350507 /* AlphabeticalSortConfiguration.nib in Resources */,
@@ -9739,7 +9739,7 @@
 				4BAA1B530632EF0000D8B92C /* ErrorAlert.png in Resources */,
 				4BAA1B610632EFE700D8B92C /* WindowAlert.png in Resources */,
 				9E217B7B06A74CA8002A3F27 /* StatusMenuItemDefaultPrefs.plist in Resources */,
-				4B97DB6706AC123A0003EE49 /* linkToolbar.png in Resources */,
+				4B97DB6706AC123A0003EE49 /* msg-insert-link.png in Resources */,
 				4BF98DCD06D149EE00E8781D /* ContactStatusColoringDefaults.plist in Resources */,
 				3461621406FB482D009181D8 /* UserList Theme.plist in Resources */,
 				3461621706FB482D009181D8 /* UserList Layout.plist in Resources */,
@@ -9777,7 +9777,7 @@
 				34A250B607E0F822009854E1 /* StatusDefaults.plist in Resources */,
 				4BFC2E7907E357F00063D70C /* emoticonBlank.png in Resources */,
 				34C899AC07E51B18009357F6 /* BuiltInEventPresets.plist in Resources */,
-				34BFD7FD07E6A50C00AD984D /* scriptToolbar.png in Resources */,
+				34BFD7FD07E6A50C00AD984D /* msg-insert-script.png in Resources */,
 				34BFDF1807E8977D00AD984D /* SoundHigh.png in Resources */,
 				34BFDF1907E8977D00AD984D /* SoundLow.png in Resources */,
 				34BFDF2007E8978900AD984D /* SendingKeyDefaults.plist in Resources */,
@@ -9790,7 +9790,7 @@
 				345F566B08178356001F733C /* AdiumServiceIcons.icns in Resources */,
 				345F57400817FF80001F733C /* pref-contactList.png in Resources */,
 				345F583E08197E74001F733C /* AdiumStatusIcons.icns in Resources */,
-				345F58C7081990FF001F733C /* LogViewer.png in Resources */,
+				345F58C7081990FF001F733C /* msg-log-viewer.png in Resources */,
 				34167FED081D706300E35678 /* DualWindowMessageAdvanced.nib in Resources */,
 				0779934F08221D9700F698DC /* Service Icons in Resources */,
 				3474E000082550FD00BF30F0 /* Credits.rtf in Resources */,
@@ -9846,20 +9846,20 @@
 				3419DE730A81042F00C3FC68 /* AccountPrefs.plist in Resources */,
 				3419DE740A81042F00C3FC68 /* BuiltInStatusStates.plist in Resources */,
 				3419DE750A81042F00C3FC68 /* ContactPrefs.plist in Resources */,
-				3419DE760A81042F00C3FC68 /* DefaultIcon.png in Resources */,
+				3419DE760A81042F00C3FC68 /* default-icon.png in Resources */,
 				3419DE770A81042F00C3FC68 /* DockPrefs.plist in Resources */,
 				3419DE780A81042F00C3FC68 /* emoticon32.png in Resources */,
 				3419DE790A81042F00C3FC68 /* emoticon32_transparent.png in Resources */,
 				3419DE7A0A81042F00C3FC68 /* FontPanelAccessoryView.nib in Resources */,
-				3419DE7C0A81042F00C3FC68 /* Lock_Locked State.png in Resources */,
-				3419DE7D0A81042F00C3FC68 /* Lock_Unlocked State.png in Resources */,
+				3419DE7C0A81042F00C3FC68 /* msg-lock-locked.png in Resources */,
+				3419DE7D0A81042F00C3FC68 /* msg-lock-unlocked.png in Resources */,
 				3419DE7E0A81042F00C3FC68 /* remove.png in Resources */,
-				3419DE7F0A81042F00C3FC68 /* sendfile.png in Resources */,
+				3419DE7F0A81042F00C3FC68 /* msg-send-file.png in Resources */,
 				3419DE820A81042F00C3FC68 /* ToolbarPrefs.plist in Resources */,
 				34DC13050A81417700D710F3 /* LoginSelect.nib in Resources */,
 				347374BD0AA9206B00AD18E3 /* ShortcutRecorder.strings in Resources */,
 				34F312BD0ADC43CA00A4310E /* xtras_duck.png in Resources */,
-				117D6DC00BC5F0C40080D02B /* notify.png in Resources */,
+				117D6DC00BC5F0C40080D02B /* msg-request-attention.png in Resources */,
 				344838690BC85EF70083723B /* AccountListPreferences.nib in Resources */,
 				344839380BC862780083723B /* pref-messages.png in Resources */,
 				34483A990BC869680083723B /* AdvancedPreferences.nib in Resources */,
@@ -9882,7 +9882,7 @@
 				4BB2EB230D88D76100CA7A7D /* timestamp32_transparent.png in Resources */,
 				34A1AEE90DFD4BFE00AC78CF /* AIAddressBookInspectorPane.nib in Resources */,
 				34A1AEEE0DFD4C4A00AC78CF /* AIAdvancedInspectorPane.nib in Resources */,
-				317D83680E89F40500298BDB /* bookmark_chat.png in Resources */,
+				317D83680E89F40500298BDB /* msg-bookmark-chat.png in Resources */,
 				117866DE0EC759B9003E9B97 /* FTProgressResend_Selected.tif in Resources */,
 				117866DF0EC759B9003E9B97 /* FTProgressResend.tif in Resources */,
 				117866E00EC759B9003E9B97 /* FTProgressResendPressed_Selected.tif in Resources */,
@@ -9909,9 +9909,9 @@
 				1130EA9E109B445D00FB3454 /* pref-messagealerts.png in Resources */,
 				11AE5555109CC88C0074BDC2 /* pref-confirmations.png in Resources */,
 				5A9A9F8B11F295EB00328DF9 /* Stop sign.png in Resources */,
-				D10A3A2B122C61EF003B5A7E /* source-destination.png in Resources */,
+				D10A3A2B122C61EF003B5A7E /* msg-source-destination.png in Resources */,
 				34333FF3127F6E77007050E8 /* TemporaryIRCAccountWindow.nib in Resources */,
-				76889DEB12D3CA17007AEF00 /* GetInfo.png in Resources */,
+				76889DEB12D3CA17007AEF00 /* get-info.png in Resources */,
 				76889DEF12D3CA40007AEF00 /* Personal.png in Resources */,
 				1154F50A12E1476900B8CA27 /* AILogByAccountWindow.nib in Resources */,
 				97AF5CF413191E9A00550C41 /* ContactListChangeUserPictureMenu.xib in Resources */,
diff -r 9b4f5ee4a326 -r be874da9a68d Frameworks/Adium Framework/Source/AIAuthorizationRequestsWindowController.m
--- a/Frameworks/Adium Framework/Source/AIAuthorizationRequestsWindowController.m	Sun Feb 19 15:12:12 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIAuthorizationRequestsWindowController.m	Thu Feb 23 19:42:55 2012 +0100
@@ -182,7 +182,7 @@
 										   toolTip:AILocalizedString(@"Get Info",nil)
 											target:self
 								   settingSelector:@selector(setImage:)
-									   itemContent:[[[NSImage alloc] initByReferencingFile:[[NSBundle mainBundle] pathForImageResource:@"GetInfo.png"]] autorelease]
+									   itemContent:[[[NSImage alloc] initByReferencingFile:[[NSBundle mainBundle] pathForImageResource:@"get-info.png"]] autorelease]
 											action:@selector(getInfo:)
 											  menu:nil];
 	
diff -r 9b4f5ee4a326 -r be874da9a68d Frameworks/Adium Framework/Source/AdiumAuthorization.m
--- a/Frameworks/Adium Framework/Source/AdiumAuthorization.m	Sun Feb 19 15:12:12 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AdiumAuthorization.m	Thu Feb 23 19:42:55 2012 +0100
@@ -179,7 +179,7 @@
 - (NSImage *)imageForEventID:(NSString *)eventID
 {
 	static NSImage	*eventImage = nil;
-	if (!eventImage) eventImage = [[NSImage imageNamed:@"DefaultIcon" forClass:[self class]] retain];
+	if (!eventImage) eventImage = [[NSImage imageNamed:@"default-icon" forClass:[self class]] retain];
 	return eventImage;
 }
 
diff -r 9b4f5ee4a326 -r be874da9a68d Plugins/Link Management/SHLinkManagementPlugin.m
--- a/Plugins/Link Management/SHLinkManagementPlugin.m	Sun Feb 19 15:12:12 2012 +0200
+++ b/Plugins/Link Management/SHLinkManagementPlugin.m	Thu Feb 23 19:42:55 2012 +0100
@@ -150,7 +150,7 @@
                                                          toolTip:AILocalizedString(@"Add/Edit Hyperlink",nil)
                                                           target:self
                                                  settingSelector:@selector(setImage:)
-                                                     itemContent:[NSImage imageNamed:@"linkToolbar" forClass:[self class] loadLazily:YES]
+                                                     itemContent:[NSImage imageNamed:@"msg-insert-link" forClass:[self class] loadLazily:YES]
                                                           action:@selector(editFormattedLink:)
                                                             menu:nil] retain];
     
diff -r 9b4f5ee4a326 -r be874da9a68d Plugins/Nudge and Buzz Handler/AINudgeBuzzHandlerPlugin.m
--- a/Plugins/Nudge and Buzz Handler/AINudgeBuzzHandlerPlugin.m	Sun Feb 19 15:12:12 2012 +0200
+++ b/Plugins/Nudge and Buzz Handler/AINudgeBuzzHandlerPlugin.m	Thu Feb 23 19:42:55 2012 +0100
@@ -99,7 +99,7 @@
 	[adium.menuController addContextualMenuItem:notifyContextualMenuItem toLocation:Context_Contact_Action];
 	
 	// Load the toolbar icon.
-	notifyToolbarIcon = [NSImage imageNamed:@"notify" forClass:[self class] loadLazily:YES];
+	notifyToolbarIcon = [NSImage imageNamed:@"msg-request-attention" forClass:[self class] loadLazily:YES];
 	
 	// Create the toolbar item
 	NSToolbarItem *chatItem = [AIToolbarUtilities toolbarItemWithIdentifier:TOOLBAR_NOTIFY_IDENTIFIER
diff -r 9b4f5ee4a326 -r be874da9a68d Plugins/Secure Messaging/ESSecureMessagingPlugin.m
--- a/Plugins/Secure Messaging/ESSecureMessagingPlugin.m	Sun Feb 19 15:12:12 2012 +0200
+++ b/Plugins/Secure Messaging/ESSecureMessagingPlugin.m	Thu Feb 23 19:42:55 2012 +0100
@@ -67,8 +67,8 @@
 	[adium.contentController setEncryptor:[[[AdiumOTREncryption alloc] init] autorelease]];
 
 	_secureMessagingMenu = nil;
-	lockImage_Locked = [[NSImage imageNamed:@"Lock_Locked State" forClass:[self class]] retain];
-	lockImage_Unlocked = [[NSImage imageNamed:@"Lock_Unlocked State" forClass:[self class]] retain];
+	lockImage_Locked = [[NSImage imageNamed:@"msg-lock-locked" forClass:[self class]] retain];
+	lockImage_Unlocked = [[NSImage imageNamed:@"msg-lock-unlocked" forClass:[self class]] retain];
 
 	[self registerToolbarItem];
 	[self configureMenuItems];
diff -r 9b4f5ee4a326 -r be874da9a68d Plugins/Secure Messaging/Lock_Locked State.png
Binary file Plugins/Secure Messaging/Lock_Locked State.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Plugins/Secure Messaging/Lock_Unlocked State.png
Binary file Plugins/Secure Messaging/Lock_Unlocked State.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Plugins/Secure Messaging/msg-lock-locked.png
Binary file Plugins/Secure Messaging/msg-lock-locked.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Plugins/Secure Messaging/msg-lock-unlocked.png
Binary file Plugins/Secure Messaging/msg-lock-unlocked.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/AddContact.png
Binary file Resources/AddContact.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/DefaultIcon.png
Binary file Resources/DefaultIcon.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/GetInfo.png
Binary file Resources/GetInfo.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/LogViewer.png
Binary file Resources/LogViewer.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/block.png
Binary file Resources/block.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/bookmark_chat.png
Binary file Resources/bookmark_chat.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/default-icon.png
Binary file Resources/default-icon.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/get-info.png
Binary file Resources/get-info.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/linkToolbar.png
Binary file Resources/linkToolbar.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/msg-add-contact.png
Binary file Resources/msg-add-contact.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/msg-block-contact.png
Binary file Resources/msg-block-contact.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/msg-bookmark-chat.png
Binary file Resources/msg-bookmark-chat.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/msg-insert-link.png
Binary file Resources/msg-insert-link.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/msg-insert-script.png
Binary file Resources/msg-insert-script.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/msg-log-viewer.png
Binary file Resources/msg-log-viewer.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/msg-request-attention.png
Binary file Resources/msg-request-attention.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/msg-send-file.png
Binary file Resources/msg-send-file.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/msg-source-destination.png
Binary file Resources/msg-source-destination.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/msg-unblock-contact.png
Binary file Resources/msg-unblock-contact.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/msg-user-icon.png
Binary file Resources/msg-user-icon.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/notify.png
Binary file Resources/notify.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/scriptToolbar.png
Binary file Resources/scriptToolbar.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/sendfile.png
Binary file Resources/sendfile.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/source-destination.png
Binary file Resources/source-destination.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/unblock.png
Binary file Resources/unblock.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Resources/userIconToolbar.png
Binary file Resources/userIconToolbar.png has changed
diff -r 9b4f5ee4a326 -r be874da9a68d Source/AIAddBookmarkPlugin.m
--- a/Source/AIAddBookmarkPlugin.m	Sun Feb 19 15:12:12 2012 +0200
+++ b/Source/AIAddBookmarkPlugin.m	Thu Feb 23 19:42:55 2012 +0100
@@ -50,7 +50,7 @@
 																		toolTip:AILocalizedString(@"Bookmark the current chat", "tooltip text for Add Bookmark")
 																  		 target:self
 																settingSelector:@selector(setImage:)
-																	itemContent:[NSImage imageNamed:@"bookmark_chat" forClass:[self class] loadLazily:YES]
+																	itemContent:[NSImage imageNamed:@"msg-bookmark-chat" forClass:[self class] loadLazily:YES]
 																		 action:@selector(addBookmark:)
 																		   menu:nil];
 	
diff -r 9b4f5ee4a326 -r be874da9a68d Source/AIContactInfoWindowPlugin.m
--- a/Source/AIContactInfoWindowPlugin.m	Sun Feb 19 15:12:12 2012 +0200
+++ b/Source/AIContactInfoWindowPlugin.m	Thu Feb 23 19:42:55 2012 +0100
@@ -201,7 +201,7 @@
 																	   toolTip:TOOLTIP_SHOW_INFO
 																		target:self
 															   settingSelector:@selector(setImage:)
-																   itemContent:[NSImage imageNamed:@"GetInfo" forClass:[self class] loadLazily:YES]
+																   itemContent:[NSImage imageNamed:@"get-info" forClass:[self class] loadLazily:YES]
 																		action:@selector(showContactInfo:)
 																		  menu:nil];
 	[adium.toolbarController registerToolbarItem:toolbarItem forToolbarType:@"ListObject"];
diff -r 9b4f5ee4a326 -r be874da9a68d Source/AIContactListEditorPlugin.m
--- a/Source/AIContactListEditorPlugin.m	Sun Feb 19 15:12:12 2012 +0200
+++ b/Source/AIContactListEditorPlugin.m	Thu Feb 23 19:42:55 2012 +0100
@@ -131,7 +131,7 @@
 														toolTip:AILocalizedString(@"Add a new contact",nil)
 														 target:self
 												settingSelector:@selector(setImage:)
-													itemContent:[NSImage imageNamed:@"AddContact" forClass:[self class] loadLazily:YES]
+													itemContent:[NSImage imageNamed:@"msg-add-contact" forClass:[self class] loadLazily:YES]
 														 action:@selector(addContact:)
 														   menu:nil];
     [adium.toolbarController registerToolbarItem:toolbarItem forToolbarType:@"ListObject"];
diff -r 9b4f5ee4a326 -r be874da9a68d Source/AIContactStatusEventsPlugin.m
--- a/Source/AIContactStatusEventsPlugin.m	Sun Feb 19 15:12:12 2012 +0200
+++ b/Source/AIContactStatusEventsPlugin.m	Thu Feb 23 19:42:55 2012 +0100
@@ -305,7 +305,7 @@
 - (NSImage *)imageForEventID:(NSString *)eventID
 {
 	static NSImage	*eventImage = nil;
-	if (!eventImage) eventImage = [[NSImage imageNamed:@"DefaultIcon" forClass:[self class]] retain];
+	if (!eventImage) eventImage = [[NSImage imageNamed:@"default-icon" forClass:[self class]] retain];
 	return eventImage;
 }
 
diff -r 9b4f5ee4a326 -r be874da9a68d Source/AIInfoInspectorPane.m
--- a/Source/AIInfoInspectorPane.m	Sun Feb 19 15:12:12 2012 +0200
+++ b/Source/AIInfoInspectorPane.m	Thu Feb 23 19:42:55 2012 +0100
@@ -122,7 +122,7 @@
 
 	//User Icon
 	if (!(currentIcon = [inObject userIcon])) {
-		currentIcon = [NSImage imageNamed:@"DefaultIcon" forClass:[self class]];
+		currentIcon = [NSImage imageNamed:@"default-icon" forClass:[self class]];
 	}
 	
 	/* NSScaleProportionally will lock an animated GIF into a single frame.  We therefore use NSScaleNone if
diff -r 9b4f5ee4a326 -r be874da9a68d Source/AILoggerPlugin.m
--- a/Source/AILoggerPlugin.m	Sun Feb 19 15:12:12 2012 +0200
+++ b/Source/AILoggerPlugin.m	Thu Feb 23 19:42:55 2012 +0100
@@ -281,7 +281,7 @@
 														toolTip:AILocalizedString(@"View previous conversations with this contact or chat",nil)
 														 target:self
 												settingSelector:@selector(setImage:)
-													itemContent:[NSImage imageNamed:@"LogViewer" forClass:[self class] loadLazily:YES]
+													itemContent:[NSImage imageNamed:@"msg-log-viewer" forClass:[self class] loadLazily:YES]
 														 action:@selector(showLogViewerForActiveChat:)
 														   menu:nil];
 	[adium.toolbarController registerToolbarItem:toolbarItem forToolbarType:@"ListObject"];
diff -r 9b4f5ee4a326 -r be874da9a68d Source/AIStandardToolbarItemsPlugin.m
--- a/Source/AIStandardToolbarItemsPlugin.m	Sun Feb 19 15:12:12 2012 +0200
+++ b/Source/AIStandardToolbarItemsPlugin.m	Thu Feb 23 19:42:55 2012 +0100
@@ -51,7 +51,7 @@
 										  toolTip:AILocalizedString(@"If multiple accounts can send to this contact or this is a combined contact, change the source and/or destination of this chat", nil)
 										   target:self
 								  settingSelector:@selector(setImage:)
-									  itemContent:[NSImage imageNamed:@"source-destination" forClass:[self class] loadLazily:YES]
+									  itemContent:[NSImage imageNamed:@"msg-source-destination" forClass:[self class] loadLazily:YES]
 										   action:@selector(showSourceDestinationPicker:)
 											 menu:nil];
 	[adium.toolbarController registerToolbarItem:toolbarItem forToolbarType:@"MessageWindow"];
diff -r 9b4f5ee4a326 -r be874da9a68d Source/ESBlockingPlugin.m
--- a/Source/ESBlockingPlugin.m	Sun Feb 19 15:12:12 2012 +0200
+++ b/Source/ESBlockingPlugin.m	Thu Feb 23 19:42:55 2012 +0100
@@ -40,8 +40,8 @@
 #define BLOCK_GROUP_MENUITEM		[BLOCK_GROUP stringByAppendingEllipsis]
 #define UNBLOCK_GROUP_MENUITEM		[UNBLOCK_GROUP stringByAppendingEllipsis]
 #define TOOLBAR_ITEM_IDENTIFIER		@"BlockParticipants"
-#define TOOLBAR_BLOCK_ICON_KEY		@"Block"
-#define TOOLBAR_UNBLOCK_ICON_KEY	@"Unblock"
+#define TOOLBAR_BLOCK_ICON_KEY		@"msg-block-contact"
+#define TOOLBAR_UNBLOCK_ICON_KEY	@"msg-unblock-contact"
 
 @interface ESBlockingPlugin()
 - (void)_setContact:(AIListContact *)contact isBlocked:(BOOL)isBlocked;
@@ -99,8 +99,8 @@
 	chatToolbarItems = [[NSMutableSet alloc] init];
 	//cache toolbar icons
 	blockedToolbarIcons = [[NSDictionary alloc] initWithObjectsAndKeys:
-								[NSImage imageNamed:@"block" forClass:[self class]], TOOLBAR_BLOCK_ICON_KEY, 
-								[NSImage imageNamed:@"unblock" forClass:[self class]], TOOLBAR_UNBLOCK_ICON_KEY, 
+								[NSImage imageNamed:@"msg-block-contact" forClass:[self class]], TOOLBAR_BLOCK_ICON_KEY, 
+								[NSImage imageNamed:@"msg-unblock-contact" forClass:[self class]], TOOLBAR_UNBLOCK_ICON_KEY, 
 								nil];
 	NSToolbarItem	*chatItem = [AIToolbarUtilities toolbarItemWithIdentifier:TOOLBAR_ITEM_IDENTIFIER
 																		label:BLOCK
diff -r 9b4f5ee4a326 -r be874da9a68d Source/ESFileTransferController.m
--- a/Source/ESFileTransferController.m	Sun Feb 19 15:12:12 2012 +0200
+++ b/Source/ESFileTransferController.m	Thu Feb 23 19:42:55 2012 +0100
@@ -108,7 +108,7 @@
 														toolTip:AILocalizedString(@"Send a file","Tooltip for the Send File toolbar item")
 														 target:self
 												settingSelector:@selector(setImage:)
-													itemContent:[NSImage imageNamed:@"sendfile" forClass:[self class] loadLazily:YES]
+													itemContent:[NSImage imageNamed:@"msg-send-file" forClass:[self class] loadLazily:YES]
 														 action:@selector(sendFileToSelectedContact:)
 														   menu:nil];
     [adium.toolbarController registerToolbarItem:toolbarItem forToolbarType:@"ListObject"];
diff -r 9b4f5ee4a326 -r be874da9a68d Source/ESOTRFingerprintDetailsWindowController.m
--- a/Source/ESOTRFingerprintDetailsWindowController.m	Sun Feb 19 15:12:12 2012 +0200
+++ b/Source/ESOTRFingerprintDetailsWindowController.m	Thu Feb 23 19:42:55 2012 +0100
@@ -91,7 +91,7 @@
 
 - (void)windowDidLoad
 {
-	[imageView_lock setImage:[NSImage imageNamed:@"Lock_Locked State" forClass:[adium class]]];	
+	[imageView_lock setImage:[NSImage imageNamed:@"msg-lock-locked" forClass:[adium class]]];	
 	
 	[[self window] setTitle:AILocalizedString(@"OTR Fingerprint",nil)];
 	[button_OK setLocalizedString:AILocalizedString(@"OK",nil)];
diff -r 9b4f5ee4a326 -r be874da9a68d Source/ESOTRPreferences.m
--- a/Source/ESOTRPreferences.m	Sun Feb 19 15:12:12 2012 +0200
+++ b/Source/ESOTRPreferences.m	Thu Feb 23 19:42:55 2012 +0100
@@ -45,7 +45,7 @@
 }
 - (NSImage *)image
 {
-	return [NSImage imageNamed:@"Lock_Locked State" forClass:[adium class]];
+	return [NSImage imageNamed:@"msg-lock-locked" forClass:[adium class]];
 }
 
 - (void)viewDidLoad
diff -r 9b4f5ee4a326 -r be874da9a68d Source/ESUserIconHandlingPlugin.m
--- a/Source/ESUserIconHandlingPlugin.m	Sun Feb 19 15:12:12 2012 +0200
+++ b/Source/ESUserIconHandlingPlugin.m	Thu Feb 23 19:42:55 2012 +0100
@@ -148,7 +148,7 @@
 	
 	[button setCornerRadius:3.0f];
 	[button setToolbarItem:toolbarItem];
-	[button setImage:[NSImage imageNamed:@"userIconToolbar" forClass:[self class] loadLazily:YES]];
+	[button setImage:[NSImage imageNamed:@"msg-user-icon" forClass:[self class] loadLazily:YES]];
 	[button release];
 
 	//Register our toolbar item
diff -r 9b4f5ee4a326 -r be874da9a68d Source/GBApplescriptFiltersPlugin.m
--- a/Source/GBApplescriptFiltersPlugin.m	Sun Feb 19 15:12:12 2012 +0200
+++ b/Source/GBApplescriptFiltersPlugin.m	Thu Feb 23 19:42:55 2012 +0100
@@ -680,7 +680,7 @@
 	
 	//Register our toolbar item
 	button = [[[MVMenuButton alloc] initWithFrame:NSMakeRect(0,0,32,32)] autorelease];
-	[button setImage:[NSImage imageNamed:@"scriptToolbar" forClass:[self class] loadLazily:YES]];
+	[button setImage:[NSImage imageNamed:@"msg-insert-script" forClass:[self class] loadLazily:YES]];
 	toolbarItem = [[AIToolbarUtilities toolbarItemWithIdentifier:SCRIPT_IDENTIFIER
 														   label:AILocalizedString(@"Scripts",nil)
 													paletteLabel:TITLE_INSERT_SCRIPT




More information about the commits mailing list