adium/adium

merge adium-1.6 into default

2013-02-14, Frank Dowsett
f1b653a8defa
Parents 43ac932380ed343579387a75
Children ba484377077b
merge adium-1.6 into default
14 files changed, 372 insertions(+), 418 deletions(-)
  • +2 -1
    ChangeLogs/Changes.txt
  • +1 -0
    Copyright.txt
  • +1 -1
    Frameworks/AIUtilities Framework/Source/AIKeychain.m
  • +1 -5
    Frameworks/Adium Framework/Source/CSNewContactAlertWindowController.m
  • +1 -5
    Frameworks/Adium Framework/Source/ESTextAndButtonsWindowController.m
  • +2 -1
    Frameworks/PSMTabBarControl.framework/Versions/A/Headers/PSMProgressIndicator.h
  • +2 -1
    Frameworks/PSMTabBarControl.framework/Versions/A/Headers/PSMTabStyle.h
  • +0 -0
    Frameworks/PSMTabBarControl.framework/Versions/A/PSMTabBarControl
  • +3 -2
    Other/Adium Spotlight Importer/GetMetadataForHTMLLog-Additions.m
  • +3 -13
    Plugins/Link Management/SHLinkEditorWindowController.m
  • +244 -346
    Resources/Credits.rtf
  • +83 -32
    Resources/LinkEditor.xib
  • +8 -8
    Resources/Preferences-Status.xib
  • +21 -3
    Source/ESStatusPreferences.m
    • --- a/ChangeLogs/Changes.txt Thu Feb 14 15:03:04 2013 +0100
    +++ b/ChangeLogs/Changes.txt Thu Feb 14 17:32:35 2013 -0500
    @@ -12,6 +12,7 @@
    Chat window
    * Fixed an issue that occurred when dragging a conversation window into an existing tabbed conversation window. (#16281)
    + * Made the Shift-Return keyboard shortcut add a newline the way Alt-Return does. (Detmud) (#16285)
    Contact list
    * Fixed an issue with contact list positioning. (#11278)
    @@ -20,7 +21,7 @@
    "Retina Display" support
    * Added high-resolution assets. (#15931, ##16067)
    * Fixed high-resolution assets not being scaled correctly in context menus. (#16143)
    - * Added for support for high-resolution emoticons in the Message View. (#16221)
    + * Added for support for high-resolution emoticons in the Message View. (Detmud) (#16221)
    * Fixed visual glitches on bottom tabs. (#16074)
    * Fixed visual glitches affecting the Transcript Viewer search bar. (#16053)
    --- a/Copyright.txt Thu Feb 14 15:03:04 2013 +0100
    +++ b/Copyright.txt Thu Feb 14 17:32:35 2013 -0500
    @@ -46,6 +46,7 @@
    Asher Haig
    Anne Halsall
    Mohammed A. Haque
    +Sebastian Hansack
    Brian Hardy
    Christopher Harms
    Jasper Hauser
    --- a/Frameworks/AIUtilities Framework/Source/AIKeychain.m Thu Feb 14 15:03:04 2013 +0100
    +++ b/Frameworks/AIUtilities Framework/Source/AIKeychain.m Thu Feb 14 17:32:35 2013 -0500
    @@ -861,7 +861,7 @@
    .tag = tags,
    .format = formats,
    };
    -
    + SecKeychainItemFreeContent( NULL, passwordBytes );
    err = SecKeychainItemCopyAttributesAndData(item,
    &info,
    /* itemClass */ NULL,
    --- a/Frameworks/Adium Framework/Source/CSNewContactAlertWindowController.m Thu Feb 14 15:03:04 2013 +0100
    +++ b/Frameworks/Adium Framework/Source/CSNewContactAlertWindowController.m Thu Feb 14 17:32:35 2013 -0500
    @@ -133,11 +133,7 @@
    // Remove the single-fire option for global
    if (configureForGlobal) {
    - if ([checkbox_oneTime respondsToSelector:@selector(setHidden:)]) {
    - [checkbox_oneTime setHidden:YES];
    - } else {
    - [checkbox_oneTime setFrame:NSZeroRect];
    - }
    + [checkbox_oneTime setHidden:YES];
    }
    // Set things up for the current event
    --- a/Frameworks/Adium Framework/Source/ESTextAndButtonsWindowController.m Thu Feb 14 15:03:04 2013 +0100
    +++ b/Frameworks/Adium Framework/Source/ESTextAndButtonsWindowController.m Thu Feb 14 17:32:35 2013 -0500
    @@ -292,11 +292,7 @@
    NSRect scrollFrame = [scrollView_message frame];
    //Remove the header area
    - if ([scrollView_messageHeader respondsToSelector:@selector(setHidden:)]) {
    - [scrollView_messageHeader setHidden:YES];
    - } else {
    - [scrollView_messageHeader setFrame:NSZeroRect];
    - }
    + [scrollView_messageHeader setHidden:YES];
    //verticalChange is how far we can move our message area up since we don't have a messageHeader
    CGFloat verticalChange = (messageHeaderFrame.size.height +
    --- a/Frameworks/PSMTabBarControl.framework/Versions/A/Headers/PSMProgressIndicator.h Thu Feb 14 15:03:04 2013 +0100
    +++ b/Frameworks/PSMTabBarControl.framework/Versions/A/Headers/PSMProgressIndicator.h Thu Feb 14 17:32:35 2013 -0500
    @@ -12,4 +12,5 @@
    @interface PSMProgressIndicator : NSProgressIndicator {
    }
    -@end
    \ No newline at end of file
    +@end
    +
    --- a/Frameworks/PSMTabBarControl.framework/Versions/A/Headers/PSMTabStyle.h Thu Feb 14 15:03:04 2013 +0100
    +++ b/Frameworks/PSMTabBarControl.framework/Versions/A/Headers/PSMTabStyle.h Thu Feb 14 17:32:35 2013 -0500
    @@ -92,4 +92,5 @@
    - (CGFloat)leftMarginForTabBarControl DEPRECATED_ATTRIBUTE;
    - (CGFloat)rightMarginForTabBarControl DEPRECATED_ATTRIBUTE;
    - (CGFloat)topMarginForTabBarControl DEPRECATED_ATTRIBUTE;
    -@end
    \ No newline at end of file
    +@end
    +
    Binary file Frameworks/PSMTabBarControl.framework/Versions/A/PSMTabBarControl has changed
    --- a/Other/Adium Spotlight Importer/GetMetadataForHTMLLog-Additions.m Thu Feb 14 15:03:04 2013 +0100
    +++ b/Other/Adium Spotlight Importer/GetMetadataForHTMLLog-Additions.m Thu Feb 14 17:32:35 2013 -0500
    @@ -49,8 +49,8 @@
    if (length && (buf[i] == '+')) {
    ++i;
    }
    - if (i >= length) return NO;
    - if ((buf[i] < '0') || (buf[i] > '9')) return NO;
    + if (i >= length) { free(buf); return NO; }
    + if ((buf[i] < '0') || (buf[i] > '9')) { free(buf); return NO; }
    unsigned total = 0;
    while (i < length) {
    @@ -64,6 +64,7 @@
    }
    [self setScanLocation:i];
    *unsignedIntValue = total;
    + free(buf);
    return YES;
    }
    --- a/Plugins/Link Management/SHLinkEditorWindowController.m Thu Feb 14 15:03:04 2013 +0100
    +++ b/Plugins/Link Management/SHLinkEditorWindowController.m Thu Feb 14 17:32:35 2013 -0500
    @@ -70,8 +70,8 @@
    NSString *linkText;
    id linkURL = nil;
    - // Get the selected link (We have to be careful when the selection is at the very end of our text view)
    - if ([[textView textStorage] length] > 0 && selectedRange.location != NSNotFound && NSMaxRange(selectedRange) <= [[textView textStorage] length]) {
    + // Text is selected if the selected range is greater than 0!
    + if (selectedRange.length > 0) {
    linkURL = [[textView textStorage] attribute:NSLinkAttributeName
    atIndex:selectedRange.location
    effectiveRange:&rangeOfLinkAttribute];
    @@ -258,17 +258,7 @@
    {
    // Validate our URL
    [textView_URL textDidChange:aNotification];
    -
    - if ([imageView_invalidURLAlert respondsToSelector:@selector(setHidden:)]) {
    - [imageView_invalidURLAlert setHidden:[textView_URL isURLValid]];
    -
    - } else { // For those stuck in jag, we can't use setHidden
    - if ([textView_URL isURLValid]) {
    - [imageView_invalidURLAlert setImage:[NSImage imageNamed:@"space" forClass:[self class]]];
    - } else {
    - [imageView_invalidURLAlert setImage:[NSImage imageNamed:@"events-error-alert" forClass:[self class]]];
    - }
    - }
    + [imageView_invalidURLAlert setHidden:[textView_URL isURLValid]];
    }
    - (BOOL)textView:(NSTextView *)aTextView doCommandBySelector:(SEL)aSelector
    --- a/Resources/Credits.rtf Thu Feb 14 15:03:04 2013 +0100
    +++ b/Resources/Credits.rtf Thu Feb 14 17:32:35 2013 -0500
    @@ -1,10 +1,10 @@
    {\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
    {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
    {\colortbl;\red255\green255\blue255;}
    -\viewkind0
    +\vieww12600\viewh10200\viewkind0
    \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -\f0\fs20 \cf0 \
    +\f0\fs22 \cf0 \
    \
    \
    \
    @@ -20,51 +20,43 @@
    \fs24 \
    \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -\b0 \cf0 \
    +\b0\fs22 \cf0 \
    \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -\b\fs22 \cf0 Lead Developers
    -\b0\fs24 \
    -
    -\fs22 Evan Schoenberg, M.D.\
    - Zachary West
    -\fs24 \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100
    +\b \cf0 Lead Developer
    +\b0 \
    + Thijs Alkemade\
    +\
    -\fs20 \cf0 \
    +\b Project Manager\
    \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -\b\fs22 \cf0 Project Manager\
    -
    -\b0 Eric Richie\
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100
    -\cf0 \
    +\b0 \cf0 Eric Richie\
    +\
    \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    \b \cf0 Developers
    \b0 \
    - Thijs Alkemade\
    Colin Barrett\
    Frank Dowsett\
    Adrian Godoroja\
    Peter Hosey\
    Matthew Needham\
    +\
    +
    +\b Lead Developer Emeritus\
    +\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    +
    +\b0 \cf0 Evan Schoenberg, M.D.\
    \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -\fs24 \cf0
    -\fs22 Nicholas Peshek
    -\fs24 \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100
    -\cf0 \
    +\b \cf0 \
    +Contributors\
    \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -\b\fs22 \cf0 Contributors\
    -
    -\b0 Paul Aurich\
    - John Bailey
    -\fs24 \
    -
    -\fs22 Adam Betts
    +\b0 \cf0 Paul Aurich\
    + John Bailey\
    + Adam Betts
    \fs20 (Adiumy iconset)
    \fs22 \
    Ariel Chinn\
    @@ -78,6 +70,7 @@
    \fs20 (Interface Icons)
    \fs22 \
    David Munch\
    + Nicholas Peshek\
    Jordan Schelew\
    Robert Vehse\
    Andrew "proton" Wellington
    @@ -86,43 +79,29 @@
    Paul Wilde
    \fs20 (User interface)
    \fs24 \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100
    -\cf0 \
    +
    +\fs22 \
    \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -\b\fs22 \cf0 Google Summer of Code \'97 2007
    +\b \cf0 Google Summer of Code \'97 2007
    \b0 \
    Erik Beerepoot, mentored by David Smith\
    Andre Cohen, mentored by Brian E. Ganninger\
    Matthew Handley, mentored by Peter Hosey\
    Andreas Monitzer, mentored by R. August Fackler\
    - Erik Kreutzer, mentored by Andrew Wellington
    -\fs24 \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100
    -\cf0 \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    + Erik Kreutzer, mentored by Andrew Wellington\
    +\
    -\b\fs22 \cf0 Google Summer of Code \'97 2006
    +\b Google Summer of Code \'97 2006
    \b0 \
    Andreas Monitzer, mentored by R. August Fackler\
    Chirag Shah, mentored by Peter Hosey\
    Joshua Lock, mentored by Colin H. Barrett\
    Kent Sutherland, mentored by David Smith\
    - Alvaro Saurin Parra, mentored by Evan Schoenberg
    -\fs24 \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100
    -\cf0 \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -
    -\b\fs22 \cf0 Webmaster\
    + Alvaro Saurin Parra, mentored by Evan Schoenberg\
    +\
    -\b0 Zachary West
    -\fs24 \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100
    -\cf0 \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -
    -\b\fs22 \cf0 Translators
    +\b Translators
    \fs24 \
    \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    @@ -131,218 +110,172 @@
    \fs24
    \fs20 (Icelandic)
    \fs24 \
    -
    -\fs22 Armas
    -\fs24
    -\fs20 (French)
    -\fs24 \
    -
    -\fs22 Daniel Bergman
    -\fs24
    -\fs20 (Swedish)
    -\fs24 \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -
    -\fs22 \cf0 biglittledragoon
    -\fs24
    -\fs20 (French)
    -\fs24 \
    -
    -\fs22 Ponthus Blomquist
    -\fs24
    -\fs20 (Swedish)
    -\b\fs24 \
    \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -\b0 \cf0
    -\fs22 P\'e4r Boberg
    +\fs22 \cf0 Armas
    +\fs20 (French)
    +\fs24 \
    +
    +\fs22 Daniel Bergman
    \fs20 (Swedish)
    \fs24 \
    -
    -\fs22 Remko Brugman
    -\fs24
    +
    +\fs22 biglittledragoon
    +\fs20 (French)
    +\fs24 \
    +
    +\fs22 Ponthus Blomquist
    +\fs20 (Swedish)
    +\b\fs24 \
    +
    +\b0\fs22 P\'e4r Boberg
    +\fs20 (Swedish)
    +\fs24 \
    +
    +\fs22 Remko Brugman
    \fs20 (Dutch)
    \fs24 \
    -
    -\fs22 \uc0\u1040 \u1083 \u1077 \u1082 \u1089 \u1072 \u1085 \u1076 \u1088 \u1041 \u1099 \u1082 \u1086 \u1074
    -\fs24
    +
    +\fs22 \uc0\u1040 \u1083 \u1077 \u1082 \u1089 \u1072 \u1085 \u1076 \u1088 \u1041 \u1099 \u1082 \u1086 \u1074
    \fs20 (Russian)
    \fs24 \
    -
    -\fs22 Frantisek Erben
    -\fs24
    +
    +\fs22 Frantisek Erben
    \fs20 (Czech)
    \fs24 \
    -
    -\fs22 Marcos Fraz\'e3o
    -\fs24
    +
    +\fs22 Marcos Fraz\'e3o
    \fs20 (Brazilian Portuguese)
    \fs24 \
    -
    -\fs22 Vasileios "tzikis" Georgitzikis
    -\fs24
    +
    +\fs22 Vasileios "tzikis" Georgitzikis
    \fs20 (Greek)
    \fs24 \
    -
    -\fs22 Bu\uc0\u287 ra Henden
    -\fs24
    +
    +\fs22 Bu\uc0\u287 ra Henden
    \fs20 (Turkish)
    \fs24 \
    -
    -\fs22 Kasper Hirvikoski
    -\fs24
    +
    +\fs22 Kasper Hirvikoski
    \fs20 (Finnish)
    \fs24 \
    -
    -\fs22 Thomas Kunze
    -\fs24
    +
    +\fs22 Thomas Kunze
    \fs20 (German)\
    -
    -\fs22 Andriy "marker" Kupyna
    -\fs24
    +
    +\fs22 Andriy "marker" Kupyna
    \fs20 (Ukrainian)
    \fs24 \
    -
    -\fs22 JT Lee
    -\fs24
    +
    +\fs22 JT Lee
    \fs20 (Simplified Chinese)
    \fs24 \
    -
    -\fs22 Ronald Leroux
    -\fs24
    +
    +\fs22 Ronald Leroux
    \fs20 (French Canadian)
    \fs24 \
    -
    -\fs22 Jack M.H. Lin
    -\fs24
    +
    +\fs22 Jack M.H. Lin
    \fs20 (Traditional Chinese)
    \fs24 \
    -
    -\fs22 Mojca Miklavec
    -\fs24
    -\fs20 (Slovenian)
    +
    +\fs22 Mojca Miklavec
    +\fs20 (Slovenian)
    \fs22 \
    - Michal Moravcik
    -\fs24
    -\fs20 (Slovakian)
    + Michal Moravcik
    +\fs20 (Slovakian)
    \fs24 \
    -
    -\fs22 Nicola "ATMB" Del Monaco
    -\fs24
    +
    +\fs22 Nicola "ATMB" Del Monaco
    \fs20 (Italian)
    \fs24 \
    -
    -\fs22 Pietro Modi
    -\fs24
    +
    +\fs22 Pietro Modi
    \fs20 (Italian)
    \fs24 \
    -
    -\fs22 David Munch
    -\fs24
    +
    +\fs22 David Munch
    \fs20 (Danish)
    \fs24 \
    -
    -\fs22 Daisuke Okada
    -\fs24
    +
    +\fs22 Daisuke Okada
    \fs20 (Japanese)
    \fs24 \
    -
    -\fs22 Bastian Olea
    -\fs24
    +
    +\fs22 Bastian Olea
    \fs20 (Spanish)
    \fs24 \
    -
    -\fs22 Gareth Potter
    -\fs24
    +
    +\fs22 Gareth Potter
    \fs20 (Japanese)
    \fs24 \
    -
    -\fs22 Daniel Ramo
    -\fs24 s
    +
    +\fs22 Daniel Ramos
    \fs20 (Portugal Portuguese)
    \fs24 \
    -
    -\fs22 Yann Ricquebourg
    -\fs24
    +
    +\fs22 Yann Ricquebourg
    \fs20 (French Canadian)
    \fs24 \
    -
    -\fs22 Eion Robb
    -\fs24
    +
    +\fs22 Eion Robb
    \fs20 (Australian English)\
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -\fs24 \cf0
    -\fs22 Jes\'fas Rodr\'edguez
    -\fs24
    +\fs22 Jes\'fas Rodr\'edguez
    \fs20 (Spanish)
    \fs24 \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -\cf0
    -\fs22 Bartosz Romanowski
    -\fs24
    +
    +\fs22 Bartosz Romanowski
    \fs20 (Polish)
    \fs24 \
    -
    -\fs22 Albert Samaniego
    -\fs24
    +
    +\fs22 Albert Samaniego
    \fs20 (Catalan)
    \fs24 \
    -
    -\fs22 Sebastian Sebus\'e6ter
    -\fs24
    +
    +\fs22 Sebastian Sebus\'e6ter
    \fs20 (Norwegian Bokm\'e5l)
    \fs24 \
    -
    -\fs22 Erik S\'f8rng\'e5rd
    -\fs24
    +
    +\fs22 Erik S\'f8rng\'e5rd
    \fs20 (Norwegian Bokm\'e5l)
    \fs24 \
    -
    -\fs22 \uc0\u1040 \u1085 \u1090 \u1086 \u1085 \u1057 \u1086 \u1090 \u1082 \u1086 \u1074
    -\fs24
    +
    +\fs22 \uc0\u1040 \u1085 \u1090 \u1086 \u1085 \u1057 \u1086 \u1090 \u1082 \u1086 \u1074
    \fs20 (Russian)
    \fs24 \
    -
    -\fs22 P\'e9ter Tutervai
    -\fs24
    +
    +\fs22 P\'e9ter Tutervai
    \fs20 (Hungarian)\
    +
    +\fs22 Robert Vehse
    +\fs20 (British English)
    +\fs24 \
    +
    +\fs22 Daniel Vidal
    +\fs20 (Catalan)
    +\fs24 \
    +
    +\fs22 Markus Wulftange
    +\fs20 (German)\
    +
    +\fs22 \
    \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -\fs22 \cf0 Robert Vehse
    -\fs20 (British English)
    -\fs24 \
    -
    -\fs22 Daniel Vidal
    -\fs24
    -\fs20 (Catalan)
    -\fs24 \
    -
    -\fs22 Markus Wulftange
    -\fs24
    -\fs20 (German)\
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100
    +\b \cf0 Retired Lead Developers
    +\b0 \
    + Adam Iser\
    + Zachary West\
    +\
    -\fs24 \cf0 \
    +\b Retired Project Manager\
    \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -\b\fs22 \cf0 Retired Lead Developer
    -\b0 \
    - Adam Iser
    -\fs24 \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100
    -\cf0 \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -
    -\b\fs22 \cf0 Retired Project Manager\
    -
    -\b0 Chris Forsythe
    -\fs24 \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100
    -\cf0 \
    +\b0 \cf0 Chris Forsythe\
    +\
    \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\li100\slleading40\sb40
    -\b\fs22 \cf0 Retired Developers
    +\b \cf0 Retired Developers
    \b0 \
    Adam Atlas\
    \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    @@ -381,13 +314,15 @@
    \cf0 Patrick Steinhardt\
    Robby Weinberg
    \fs24 \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\li100
    -\cf0 \
    +\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\li100\slleading40\sb40
    +
    +\fs22 \cf0 \
    \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -\b\fs22 \cf0 Retired Contributors\
    +\b \cf0 Retired Contributors\
    +\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -\b0 Sumeet "retsam" Agarwal\
    +\b0 \cf0 Sumeet "retsam" Agarwal\
    Derrick "shadow" Brashear\
    Lars "lechimp" N\'e6sbye Christensen\
    Benjamin Costello
    @@ -399,36 +334,25 @@
    Patrick Gibson\
    Kiel Gillard
    \fs24 \
    -
    -\fs22 Asher Haig
    -\fs24
    -\fs20 (Build scripts)
    +
    +\fs22 Asher Haig
    +\fs20 (Build scripts)
    \b\fs28 \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -\b0\fs24 \cf0
    -\fs22 Andrew Harvey
    +\b0\fs22 Andrew Harvey
    \b \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -\b0 \cf0 Jasper Hauser
    +\b0 Jasper Hauser
    \fs24
    \fs20 (Interface Icons)\
    -
    -\fs22 Kyle Jorgensen
    -\fs20 (Adium 1.4 help updates)
    +
    +\fs22 Kyle Jorgensen
    +\fs20 (Adium 1.4 help updates)
    \fs24 \
    -
    -\fs22 Mathieu "mathieuma" Masseboeuf\
    +
    +\fs22 Mathieu "mathieuma" Masseboeuf\
    Laura Natcher
    \fs20 (Duck Icon Variants, Crash Reporter Art)
    -\b\fs22 \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -
    -\b0\fs24 \cf0
    -\fs22 James Panther
    -\fs24
    -\fs20 (Australian English)
    \fs22 \
    Nick "taktile" Pisarro\
    Brent "berhr" Redeker\
    @@ -437,109 +361,92 @@
    \fs20 (Feedback and Testing)
    \b\fs28 \
    -\b0\fs24
    -\fs22 Steven "steventamm" Tamm
    +\b0\fs22 Steven "steventamm" Tamm
    \b \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -\b0 \cf0 Andrew Tennant
    +\b0 Andrew Tennant
    \fs24
    \fs20 (Adium 1.0 help system)
    \b\fs28 \
    +
    +\b0\fs22 Wesley Underwood
    +\fs20 (Interface Icons)
    +\fs24 \
    +
    +\fs22 Trevin "TJ" Ward\
    + Robert Wenger\
    + Ofri Wolfus\
    +\
    \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -\b0\fs24 \cf0
    -\fs22 Wesley Underwood
    -\fs24
    -\fs20 (Interface Icons)
    +\b \cf0 Retired Translators
    \fs24 \
    -
    -\fs22 Trevin "TJ" Ward\
    - Robert Wenger\
    - Ofri Wolfus
    -\fs24 \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100
    -\cf0 \
    \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -\b\fs22 \cf0 Retired Translators
    +\b0\fs22 \cf0 Max Bertrand
    +\fs20 (French)
    +\b\fs24 \
    +\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    +
    +\fs22 \cf0
    +\b0 Juan Jes\'fas Cervera
    +\fs20 (Spanish)
    \fs24 \
    \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -\b0 \cf0
    -\fs22 Max Bertrand
    -\fs20 (French)
    -\b\fs24 \
    +\fs22 \cf0 Mat\'edas Cuadros
    +\fs20 (Spanish)
    +\fs24 \
    -\b0
    -\fs22 Juan Jes\'fas Cervera
    -\fs20 (Spanish)
    -\fs24 \
    -
    -\fs22 Mat\'edas Cuadros
    -\fs20 (Spanish)
    -\fs24 \
    -
    -\fs22 Flyttbar Johansen
    -\fs24
    +\fs22 Flyttbar Johansen
    \fs20 (Norweigan)
    \fs24 \
    -
    -\fs22 Jamie Kirkpatrick
    -\fs20 (Brazilian Portuguese)
    +
    +\fs22 Jamie Kirkpatrick
    +\fs20 (Brazilian Portuguese)
    \fs24 \
    -
    -\fs22 Helv\'e9cio Mafra
    -\fs20 (Brazilian Portuguese)
    +
    +\fs22 Helv\'e9cio Mafra
    +\fs20 (Brazilian Portuguese)
    \fs24 \
    -
    -\fs22 Magnus Markling
    -\fs24
    +
    +\fs22 Magnus Markling
    \fs20 (Swedish)\
    -\fs24
    -\fs22 Roeland Nas
    -\fs20 (Dutch)\
    +\fs22 Roeland Nas
    +\fs20 (Dutch)\
    -\fs24
    -\fs22 Lex Nicolaes
    -\fs20 (Dutch)
    +\fs22 Lex Nicolaes
    +\fs20 (Dutch)
    \fs24 \
    -
    -\fs22 Alberto N\'fa\'f1ez
    -\fs24
    +
    +\fs22 Alberto N\'fa\'f1ez
    \fs20 (Spanish)
    \fs24 \
    -
    -\fs22 \uc0\u1042 \u1072 \u1083 \u1077 \u1085 \u1090 \u1080 \u1085 \u1055 \u1072 \u1088 \u1085 \u1072 \u1093
    -\fs24
    +
    +\fs22 \uc0\u1042 \u1072 \u1083 \u1077 \u1085 \u1090 \u1080 \u1085 \u1055 \u1072 \u1088 \u1085 \u1072 \u1093
    \fs20 (Russian)
    \fs24 \
    -
    -\fs22 Peter Piln\'e4s
    -\fs24
    +
    +\fs22 James Panther
    +\fs20 (Australian English)
    +\fs24 \
    +
    +\fs22 Peter Piln\'e4s
    \fs20 (Swedish)\
    -\fs24
    -\fs22 Marc S. Re\'dfl
    -\fs24
    +\fs22 Marc S. Re\'dfl
    \fs20 (Catalan)\
    -\fs24
    -\fs22 Martin Srebotnjak
    -\fs24
    +\fs22 Martin Srebotnjak
    \fs20 (Slovenian)
    \fs24 \
    -
    -\fs22 Lassi Veikkonen
    -\fs24
    +
    +\fs22 Lassi Veikkonen
    \fs20 (Finnish)
    \fs24 \
    -
    -\fs22 Adam Weinberger
    -\fs24
    -\fs20 (Canadian English)
    -\fs24 \
    +
    +\fs22 Adam Weinberger (Canadian English)\
    \
    \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    @@ -550,72 +457,63 @@
    \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    \fs22 \cf0 Other\
    -
    -\b0 The Pidgin Team
    -\fs20 \'a0(libpurple)\
    -
    -\fs22 NetworkRedux
    -\fs24
    -\fs20 \'a0(Adium's Hosting)\
    - <http://www.networkredux.com/> \
    - CacheFly (Adium's CDN)\
    - <http://www.cachefly.com/>\
    \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -\fs24 \cf0
    -\fs22 CocoaForge.com
    -\fs24
    -\fs20 \'a0(CocoaForge Adium Forums Hosting) \
    +\b0 \cf0 The Pidgin Team
    +\fs20 \'a0(libpurple)\
    +
    +\fs22 NetworkRedux \'a0
    +\fs20 (Adium's Hosting)\
    + <http://www.networkredux.com/>\
    -\fs24
    -\fs22 Noah Kantrowitz
    -\fs24
    -\fs20 (major assistance with ticket system) \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100
    -\cf0 \
    +\fs22 CacheFly (Adium's CDN)
    +\fs20 \
    + <http://www.cachefly.com/>\
    +
    +\fs22 CocoaForge.com \'a0
    +\fs20 (CocoaForge Adium Forums Hosting)\
    +
    +\fs22 Noah Kantrowitz
    +\fs20 (major assistance with ticket system)\
    +\
    \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    \b\fs22 \cf0 Original Adium and Previous Contributors\
    -
    -\b0 Erik J. Barzeski
    -\fs20 \'a0(Code Contributions)
    -\fs24 \
    -
    -\fs22 Jeremy Knickerbocker
    -\fs20 \'a0(Build Hosting)
    -\fs24 \
    -
    -\fs22 Greg Smith
    -\fs20 \'a0(Code Contributions) \
    \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -\fs24 \cf0
    -\fs22 Vinay Venkatesh
    -\fs20 \'a0(Code Contributions)\
    +\b0 \cf0 Erik J. Barzeski
    +\fs20 \'a0(Code Contributions)
    +\fs24 \
    -\fs24
    -\fs22 AmbitiousLemon.com
    -\fs20 \'a0(FunMac Adium Forums Hosting)
    +\fs22 Jeremy Knickerbocker \'a0
    +\fs20 (Build Hosting)
    \fs24 \
    -
    -\fs22 New York Internet
    -\fs20 \'a0(1.x Site Hosting)\
    +
    +\fs22 Greg Smith \'a0
    +\fs20 (Code Contributions)\
    +
    +\fs22 Vinay Venkatesh \'a0
    +\fs20 (Code Contributions)\
    +
    +\fs22 AmbitiousLemon.com \'a0
    +\fs20 (FunMac Adium Forums Hosting)
    +\fs24 \
    -\fs24
    -\fs22 Penguinmilitia.net
    -\fs20 \'a0(SVN Project Hosting and Email Hosting) \
    +\fs22 New York Internet \'a0
    +\fs20 (1.x Site Hosting)\
    -\fs24
    -\fs22 SourceForge.net
    -\fs20 \'a0(Project Hosting)
    +\fs22 Penguinmilitia.net \'a0
    +\fs20 (SVN Project Hosting and Email Hosting)\
    +
    +\fs22 SourceForge.net \'a0
    +\fs20 (Project Hosting)
    \fs24 \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100
    +\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    \fs20 \cf0 \
    +Adium is distributed under the GNU General Public License. It is considered free software, and you are allowed to distribute it under certain conditions. See the GNU General Public License for more details.\
    +\
    \pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    -\cf0 Adium is distributed under the GNU General Public License. It is considered free software, and you are allowed to distribute it under certain conditions. See the GNU General Public License for more details.\
    -\
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100
    \cf0 \CocoaLigature0 Many of Adium's protocols are powered by Libpurple, a multi-protocol instant messaging library:\
    <http://developer.pidgin.im/>.\
    \
    @@ -623,10 +521,10 @@
    <http://www.arizona-software.ch/ilocalize/>\
    \
    Adium also utilizes:\
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100
    +\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    \cf0 \CocoaLigature1 \
    \CocoaLigature0 \'95\CocoaLigature1 Small portions of code from, and knowledge gained by examining, Colloquy\
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100
    +\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    \cf0 \CocoaLigature0 <\CocoaLigature1 http://colloquy.info/>\
    \
    \CocoaLigature0 \'95\CocoaLigature1 DiskImageUtilities, a class by Google for smoothly handling attempts to run from a disk image\
    @@ -635,12 +533,12 @@
    \CocoaLigature0 \'95\CocoaLigature1 GNU FriBidi, an implementation of the Unicode bidirectional algorithm\
    \CocoaLigature0 <\CocoaLigature1 http://fribidi.org/>\
    \CocoaLigature0 \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100
    +\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    \cf0 \CocoaLigature1 \CocoaLigature0 \'95\CocoaLigature1 \CocoaLigature0 Growl, a notification framework\
    <http://growl.info/>\CocoaLigature1 \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100
    +\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    \cf0 \CocoaLigature0 \
    -\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100
    +\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
    \cf0 \CocoaLigature1 \CocoaLigature0 \'95\CocoaLigature1 \CocoaLigature0 KNShelfSplitView from Feed, a Growl extra\
    <http://growl.info/>\
    \
    --- a/Resources/LinkEditor.xib Thu Feb 14 15:03:04 2013 +0100
    +++ b/Resources/LinkEditor.xib Thu Feb 14 17:32:35 2013 -0500
    @@ -2,27 +2,27 @@
    <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
    <data>
    <int key="IBDocument.SystemTarget">1060</int>
    - <string key="IBDocument.SystemVersion">11D50b</string>
    - <string key="IBDocument.InterfaceBuilderVersion">2182</string>
    - <string key="IBDocument.AppKitVersion">1138.32</string>
    - <string key="IBDocument.HIToolboxVersion">568.00</string>
    + <string key="IBDocument.SystemVersion">12C60</string>
    + <string key="IBDocument.InterfaceBuilderVersion">3084</string>
    + <string key="IBDocument.AppKitVersion">1187.34</string>
    + <string key="IBDocument.HIToolboxVersion">625.00</string>
    <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
    <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
    - <string key="NS.object.0">2182</string>
    + <string key="NS.object.0">3084</string>
    </object>
    <array key="IBDocument.IntegratedClassDependencies">
    + <string>NSButton</string>
    + <string>NSButtonCell</string>
    + <string>NSCustomObject</string>
    + <string>NSImageCell</string>
    + <string>NSImageView</string>
    + <string>NSScrollView</string>
    <string>NSScroller</string>
    - <string>NSButton</string>
    - <string>NSScrollView</string>
    + <string>NSTextField</string>
    <string>NSTextFieldCell</string>
    - <string>NSButtonCell</string>
    - <string>NSImageView</string>
    - <string>NSImageCell</string>
    - <string>NSCustomObject</string>
    <string>NSTextView</string>
    <string>NSView</string>
    <string>NSWindowTemplate</string>
    - <string>NSTextField</string>
    </array>
    <array key="IBDocument.PluginDependencies">
    <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
    @@ -54,7 +54,7 @@
    <nil key="NSUserInterfaceItemIdentifier"/>
    <string key="NSWindowContentMinSize">{213, 107}</string>
    <object class="NSView" key="NSWindowView" id="1020572715">
    - <nil key="NSNextResponder"/>
    + <reference key="NSNextResponder"/>
    <int key="NSvFlags">256</int>
    <array class="NSMutableArray" key="NSSubviews">
    <object class="NSTextField" id="275025321">
    @@ -62,9 +62,11 @@
    <int key="NSvFlags">257</int>
    <string key="NSFrame">{{13, 126}, {67, 17}}</string>
    <reference key="NSSuperview" ref="1020572715"/>
    + <reference key="NSWindow"/>
    + <reference key="NSNextKeyView" ref="741391648"/>
    <bool key="NSEnabled">YES</bool>
    <object class="NSTextFieldCell" key="NSCell" id="902976334">
    - <int key="NSCellFlags">67239424</int>
    + <int key="NSCellFlags">67108864</int>
    <int key="NSCellFlags2">71303168</int>
    <string key="NSContents">Link Text:</string>
    <object class="NSFont" key="NSSupport" id="269900293">
    @@ -92,15 +94,18 @@
    </object>
    </object>
    </object>
    + <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
    </object>
    <object class="NSTextField" id="985332958">
    <reference key="NSNextResponder" ref="1020572715"/>
    <int key="NSvFlags">257</int>
    <string key="NSFrame">{{13, 99}, {67, 17}}</string>
    <reference key="NSSuperview" ref="1020572715"/>
    + <reference key="NSWindow"/>
    + <reference key="NSNextKeyView" ref="286700648"/>
    <bool key="NSEnabled">YES</bool>
    <object class="NSTextFieldCell" key="NSCell" id="144311258">
    - <int key="NSCellFlags">67239424</int>
    + <int key="NSCellFlags">67108864</int>
    <int key="NSCellFlags2">71303168</int>
    <string key="NSContents">URL:</string>
    <reference key="NSSupport" ref="269900293"/>
    @@ -108,15 +113,18 @@
    <reference key="NSBackgroundColor" ref="799204711"/>
    <reference key="NSTextColor" ref="90910145"/>
    </object>
    + <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
    </object>
    <object class="NSTextField" id="741391648">
    <reference key="NSNextResponder" ref="1020572715"/>
    <int key="NSvFlags">257</int>
    <string key="NSFrame">{{85, 124}, {343, 22}}</string>
    <reference key="NSSuperview" ref="1020572715"/>
    + <reference key="NSWindow"/>
    + <reference key="NSNextKeyView" ref="985332958"/>
    <bool key="NSEnabled">YES</bool>
    <object class="NSTextFieldCell" key="NSCell" id="90209989">
    - <int key="NSCellFlags">-1804468671</int>
    + <int key="NSCellFlags">-1804599231</int>
    <int key="NSCellFlags2">4195328</int>
    <string key="NSContents"/>
    <reference key="NSSupport" ref="269900293"/>
    @@ -138,6 +146,7 @@
    <reference key="NSColor" ref="284375813"/>
    </object>
    </object>
    + <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
    </object>
    <object class="NSScrollView" id="977442784">
    <reference key="NSNextResponder" ref="1020572715"/>
    @@ -150,8 +159,29 @@
    <object class="NSTextView" id="847484606">
    <reference key="NSNextResponder" ref="400398929"/>
    <int key="NSvFlags">2322</int>
    + <set class="NSMutableSet" key="NSDragTypes">
    + <string>Apple HTML pasteboard type</string>
    + <string>Apple PDF pasteboard type</string>
    + <string>Apple PICT pasteboard type</string>
    + <string>Apple PNG pasteboard type</string>
    + <string>Apple URL pasteboard type</string>
    + <string>CorePasteboardFlavorType 0x6D6F6F76</string>
    + <string>NSColor pasteboard type</string>
    + <string>NSFilenamesPboardType</string>
    + <string>NSStringPboardType</string>
    + <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
    + <string>NeXT RTFD pasteboard type</string>
    + <string>NeXT Rich Text Format v1.0 pasteboard type</string>
    + <string>NeXT TIFF v4.0 pasteboard type</string>
    + <string>NeXT font pasteboard type</string>
    + <string>NeXT ruler pasteboard type</string>
    + <string>WebURLsWithTitlesPboardType</string>
    + <string>public.url</string>
    + </set>
    <string key="NSFrameSize">{341, 54}</string>
    <reference key="NSSuperview" ref="400398929"/>
    + <reference key="NSWindow"/>
    + <reference key="NSNextKeyView" ref="464927471"/>
    <object class="NSTextContainer" key="NSTextContainer" id="657806778">
    <object class="NSLayoutManager" key="NSLayoutManager">
    <object class="NSTextStorage" key="NSTextStorage">
    @@ -163,7 +193,7 @@
    <array class="NSMutableArray" key="NSTextContainers">
    <reference ref="657806778"/>
    </array>
    - <int key="NSLMFlags">6</int>
    + <int key="NSLMFlags">38</int>
    <nil key="NSDelegate"/>
    </object>
    <reference key="NSTextView" ref="847484606"/>
    @@ -171,7 +201,7 @@
    <int key="NSTCFlags">1</int>
    </object>
    <object class="NSTextViewSharedData" key="NSSharedData">
    - <int key="NSFlags">100666211</int>
    + <int key="NSFlags">67111779</int>
    <int key="NSTextCheckingTypes">0</int>
    <nil key="NSMarkedAttributes"/>
    <reference key="NSBackgroundColor" ref="469115896"/>
    @@ -207,12 +237,12 @@
    </object>
    <int key="NSTVFlags">6</int>
    <string key="NSMaxSize">{341, 10000000}</string>
    - <string key="NSMinize">{291, 54}</string>
    <nil key="NSDelegate"/>
    </object>
    </array>
    <string key="NSFrame">{{1, 1}, {341, 54}}</string>
    <reference key="NSSuperview" ref="977442784"/>
    + <reference key="NSWindow"/>
    <reference key="NSNextKeyView" ref="847484606"/>
    <reference key="NSDocView" ref="847484606"/>
    <reference key="NSBGColor" ref="469115896"/>
    @@ -247,6 +277,9 @@
    <int key="NSvFlags">-2147483392</int>
    <string key="NSFrame">{{-22, 1}, {11, 54}}</string>
    <reference key="NSSuperview" ref="977442784"/>
    + <reference key="NSWindow"/>
    + <reference key="NSNextKeyView" ref="400398929"/>
    + <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
    <int key="NSsFlags">256</int>
    <reference key="NSTarget" ref="977442784"/>
    <string key="NSAction">_doScroller:</string>
    @@ -257,6 +290,9 @@
    <int key="NSvFlags">-2147483392</int>
    <string key="NSFrame">{{-100, -100}, {87, 18}}</string>
    <reference key="NSSuperview" ref="977442784"/>
    + <reference key="NSWindow"/>
    + <reference key="NSNextKeyView" ref="847458639"/>
    + <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
    <int key="NSsFlags">257</int>
    <reference key="NSTarget" ref="977442784"/>
    <string key="NSAction">_doScroller:</string>
    @@ -266,25 +302,31 @@
    </array>
    <string key="NSFrame">{{85, 60}, {343, 56}}</string>
    <reference key="NSSuperview" ref="1020572715"/>
    - <reference key="NSNextKeyView" ref="400398929"/>
    + <reference key="NSWindow"/>
    + <reference key="NSNextKeyView" ref="768550780"/>
    <int key="NSsFlags">133650</int>
    <reference key="NSVScroller" ref="847458639"/>
    <reference key="NSHScroller" ref="768550780"/>
    <reference key="NSContentView" ref="400398929"/>
    + <double key="NSMinMagnification">0.25</double>
    + <double key="NSMaxMagnification">4</double>
    + <double key="NSMagnification">1</double>
    </object>
    <object class="NSButton" id="241117186">
    <reference key="NSNextResponder" ref="1020572715"/>
    <int key="NSvFlags">257</int>
    <string key="NSFrame">{{353, 12}, {83, 32}}</string>
    <reference key="NSSuperview" ref="1020572715"/>
    + <reference key="NSWindow"/>
    + <reference key="NSNextKeyView"/>
    <bool key="NSEnabled">YES</bool>
    <object class="NSButtonCell" key="NSCell" id="841529738">
    - <int key="NSCellFlags">-2080244224</int>
    + <int key="NSCellFlags">-2080374784</int>
    <int key="NSCellFlags2">134217728</int>
    <string key="NSContents">Insert</string>
    <reference key="NSSupport" ref="269900293"/>
    <reference key="NSControlView" ref="241117186"/>
    - <int key="NSButtonFlags">-2038284033</int>
    + <int key="NSButtonFlags">-2038284288</int>
    <int key="NSButtonFlags2">1</int>
    <reference key="NSAlternateImage" ref="269900293"/>
    <string key="NSAlternateContents"/>
    @@ -292,20 +334,23 @@
    <int key="NSPeriodicDelay">200</int>
    <int key="NSPeriodicInterval">25</int>
    </object>
    + <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
    </object>
    <object class="NSButton" id="101844356">
    <reference key="NSNextResponder" ref="1020572715"/>
    <int key="NSvFlags">257</int>
    <string key="NSFrame">{{271, 12}, {82, 32}}</string>
    <reference key="NSSuperview" ref="1020572715"/>
    + <reference key="NSWindow"/>
    + <reference key="NSNextKeyView" ref="241117186"/>
    <bool key="NSEnabled">YES</bool>
    <object class="NSButtonCell" key="NSCell" id="657611475">
    - <int key="NSCellFlags">67239424</int>
    + <int key="NSCellFlags">67108864</int>
    <int key="NSCellFlags2">134217728</int>
    <string key="NSContents">Cancel</string>
    <reference key="NSSupport" ref="269900293"/>
    <reference key="NSControlView" ref="101844356"/>
    - <int key="NSButtonFlags">-2038284033</int>
    + <int key="NSButtonFlags">-2038284288</int>
    <int key="NSButtonFlags2">1</int>
    <reference key="NSAlternateImage" ref="269900293"/>
    <string key="NSAlternateContents"/>
    @@ -313,6 +358,7 @@
    <int key="NSPeriodicDelay">200</int>
    <int key="NSPeriodicInterval">25</int>
    </object>
    + <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
    </object>
    <object class="NSImageView" id="286700648">
    <reference key="NSNextResponder" ref="1020572715"/>
    @@ -327,9 +373,11 @@
    </set>
    <string key="NSFrame">{{46, 67}, {32, 32}}</string>
    <reference key="NSSuperview" ref="1020572715"/>
    + <reference key="NSWindow"/>
    + <reference key="NSNextKeyView" ref="977442784"/>
    <bool key="NSEnabled">YES</bool>
    <object class="NSImageCell" key="NSCell" id="777432932">
    - <int key="NSCellFlags">130560</int>
    + <int key="NSCellFlags">134217728</int>
    <int key="NSCellFlags2">33554432</int>
    <object class="NSCustomResource" key="NSContents">
    <string key="NSClassName">NSImage</string>
    @@ -340,6 +388,7 @@
    <int key="NSStyle">0</int>
    <bool key="NSAnimates">NO</bool>
    </object>
    + <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
    <bool key="NSEditable">YES</bool>
    </object>
    <object class="NSButton" id="464927471">
    @@ -347,14 +396,16 @@
    <int key="NSvFlags">260</int>
    <string key="NSFrame">{{14, 12}, {121, 32}}</string>
    <reference key="NSSuperview" ref="1020572715"/>
    + <reference key="NSWindow"/>
    + <reference key="NSNextKeyView" ref="101844356"/>
    <bool key="NSEnabled">YES</bool>
    <object class="NSButtonCell" key="NSCell" id="950174949">
    - <int key="NSCellFlags">67239424</int>
    + <int key="NSCellFlags">67108864</int>
    <int key="NSCellFlags2">134217728</int>
    <string key="NSContents">Remove Link</string>
    <reference key="NSSupport" ref="269900293"/>
    <reference key="NSControlView" ref="464927471"/>
    - <int key="NSButtonFlags">-2038284033</int>
    + <int key="NSButtonFlags">-2038284288</int>
    <int key="NSButtonFlags2">1</int>
    <reference key="NSAlternateImage" ref="269900293"/>
    <string key="NSAlternateContents"/>
    @@ -364,11 +415,15 @@
    <int key="NSPeriodicDelay">200</int>
    <int key="NSPeriodicInterval">25</int>
    </object>
    + <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
    </object>
    </array>
    <string key="NSFrameSize">{448, 166}</string>
    + <reference key="NSSuperview"/>
    + <reference key="NSWindow"/>
    + <reference key="NSNextKeyView" ref="275025321"/>
    </object>
    - <string key="NSScreenRect">{{0, 0}, {1400, 1050}}</string>
    + <string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
    <string key="NSMinSize">{213, 129}</string>
    <string key="NSMaxSize">{10000000000000, 10000000000000}</string>
    <bool key="NSWindowIsRestorable">YES</bool>
    @@ -774,10 +829,6 @@
    <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
    <real value="1060" key="NS.object.0"/>
    </object>
    - <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
    - <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
    - <real value="1060" key="NS.object.0"/>
    - </object>
    <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
    <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
    <real value="3200" key="NS.object.0"/>
    --- a/Resources/Preferences-Status.xib Thu Feb 14 15:03:04 2013 +0100
    +++ b/Resources/Preferences-Status.xib Thu Feb 14 17:32:35 2013 -0500
    @@ -3,12 +3,12 @@
    <data>
    <int key="IBDocument.SystemTarget">1060</int>
    <string key="IBDocument.SystemVersion">12C60</string>
    - <string key="IBDocument.InterfaceBuilderVersion">2843</string>
    + <string key="IBDocument.InterfaceBuilderVersion">3084</string>
    <string key="IBDocument.AppKitVersion">1187.34</string>
    <string key="IBDocument.HIToolboxVersion">625.00</string>
    <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
    <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
    - <string key="NS.object.0">2843</string>
    + <string key="NS.object.0">3084</string>
    </object>
    <array key="IBDocument.IntegratedClassDependencies">
    <string>NSBox</string>
    @@ -287,7 +287,7 @@
    <object class="NSTextField" id="827326141">
    <reference key="NSNextResponder" ref="847794410"/>
    <int key="NSvFlags">256</int>
    - <string key="NSFrame">{{290, 365}, {151, 17}}</string>
    + <string key="NSFrame">{{182, 365}, {151, 17}}</string>
    <reference key="NSSuperview" ref="847794410"/>
    <reference key="NSWindow"/>
    <reference key="NSNextKeyView" ref="114536691"/>
    @@ -347,7 +347,7 @@
    <object class="NSStepper" id="260371314">
    <reference key="NSNextResponder" ref="847794410"/>
    <int key="NSvFlags">268</int>
    - <string key="NSFrame">{{269, 359}, {19, 28}}</string>
    + <string key="NSFrame">{{161, 359}, {19, 28}}</string>
    <reference key="NSSuperview" ref="847794410"/>
    <reference key="NSWindow"/>
    <reference key="NSNextKeyView" ref="827326141"/>
    @@ -367,7 +367,7 @@
    <object class="NSTextField" id="413878704">
    <reference key="NSNextResponder" ref="847794410"/>
    <int key="NSvFlags">268</int>
    - <string key="NSFrame">{{237, 362}, {32, 22}}</string>
    + <string key="NSFrame">{{124, 362}, {32, 22}}</string>
    <reference key="NSSuperview" ref="847794410"/>
    <reference key="NSWindow"/>
    <reference key="NSNextKeyView" ref="260371314"/>
    @@ -400,7 +400,7 @@
    <object class="NSButton" id="503412681">
    <reference key="NSNextResponder" ref="847794410"/>
    <int key="NSvFlags">256</int>
    - <string key="NSFrame">{{16, 364}, {215, 18}}</string>
    + <string key="NSFrame">{{16, 364}, {102, 18}}</string>
    <reference key="NSSuperview" ref="847794410"/>
    <reference key="NSWindow"/>
    <reference key="NSNextKeyView" ref="413878704"/>
    @@ -408,7 +408,7 @@
    <object class="NSButtonCell" key="NSCell" id="515118068">
    <int key="NSCellFlags">67108864</int>
    <int key="NSCellFlags2">0</int>
    - <string key="NSContents">Let others know I am idle after</string>
    + <string key="NSContents">Set idle after</string>
    <reference key="NSSupport" ref="92740964"/>
    <reference key="NSControlView" ref="503412681"/>
    <int key="NSButtonFlags">1211912448</int>
    @@ -2390,7 +2390,6 @@
    <reference ref="935309897"/>
    <reference ref="965781515"/>
    <reference ref="142559874"/>
    - <reference ref="827326141"/>
    <reference ref="445005678"/>
    <reference ref="260371314"/>
    <reference ref="413878704"/>
    @@ -2405,6 +2404,7 @@
    <reference ref="621441915"/>
    <reference ref="479729983"/>
    <reference ref="735263584"/>
    + <reference ref="827326141"/>
    </array>
    <reference key="parent" ref="512098607"/>
    </object>
    --- a/Source/ESStatusPreferences.m Thu Feb 14 15:03:04 2013 +0100
    +++ b/Source/ESStatusPreferences.m Thu Feb 14 17:32:35 2013 -0500
    @@ -138,10 +138,28 @@
    [tabItem_status setLabel:AILocalizedString(@"Saved Statuses", nil)];
    [tabItem_settings setLabel:AILocalizedString(@"Settings", nil)];
    - [button_addGroup setLocalizedString:AILocalizedString(@"Add Group", nil)];
    - [button_editState setLocalizedString:AILocalizedString(@"Edit", nil)];
    + {
    + NSRect newFrame, oldFrame;
    + oldFrame = [button_addGroup frame];
    + [button_addGroup setTitle:AILocalizedString(@"Add Group", nil)];
    + [button_addGroup sizeToFit];
    + newFrame = [button_addGroup frame];
    + if (newFrame.size.width < oldFrame.size.width) newFrame.size.width = oldFrame.size.width;
    + newFrame.origin.x = oldFrame.origin.x;
    + [button_addGroup setFrame:newFrame];
    + }
    + {
    + NSRect newFrame, oldFrame;
    + oldFrame = [button_editState frame];
    + [button_editState setTitle:AILocalizedStringFromTable(@"Edit", @"Buttons", "Verb 'edit' on a button")];
    + [button_editState sizeToFit];
    + newFrame = [button_editState frame];
    + if (newFrame.size.width < oldFrame.size.width) newFrame.size.width = oldFrame.size.width;
    + newFrame.origin.x = oldFrame.origin.x + oldFrame.size.width - newFrame.size.width;
    + [button_editState setFrame:newFrame];
    + }
    - [checkBox_idle setLocalizedString:AILocalizedString(@"Let others know I am idle after", nil)];
    + [checkBox_idle setLocalizedString:AILocalizedString(@"Set idle after", nil)];
    [label_inactivity setLocalizedString:AILocalizedString(@"minutes of inactivity", nil)];
    [checkBox_autoAway setLocalizedString:AILocalizedString(@"After", nil)];