adium 5334:f1b653a8defa: merge adium-1.6 into default
commits at adium.im
commits at adium.im
Thu Feb 14 22:33:02 UTC 2013
details: http://hg.adium.im/adium/rev/f1b653a8defa
revision: 5334:f1b653a8defa
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Thu Feb 14 17:32:35 2013 -0500
merge adium-1.6 into default
diffs (truncated from 1494 to 1000 lines):
diff -r 43ac932380ed -r f1b653a8defa ChangeLogs/Changes.txt
--- 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)
diff -r 43ac932380ed -r f1b653a8defa Copyright.txt
--- 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
diff -r 43ac932380ed -r f1b653a8defa Frameworks/AIUtilities Framework/Source/AIKeychain.m
--- 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,
diff -r 43ac932380ed -r f1b653a8defa Frameworks/Adium Framework/Source/CSNewContactAlertWindowController.m
--- 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
diff -r 43ac932380ed -r f1b653a8defa Frameworks/Adium Framework/Source/ESTextAndButtonsWindowController.m
--- 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 +
diff -r 43ac932380ed -r f1b653a8defa Frameworks/PSMTabBarControl.framework/Versions/A/Headers/PSMProgressIndicator.h
--- 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 {
}
- at end
\ No newline at end of file
+ at end
+
diff -r 43ac932380ed -r f1b653a8defa Frameworks/PSMTabBarControl.framework/Versions/A/Headers/PSMTabStyle.h
--- 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;
- at end
\ No newline at end of file
+ at end
+
diff -r 43ac932380ed -r f1b653a8defa Frameworks/PSMTabBarControl.framework/Versions/A/PSMTabBarControl
Binary file Frameworks/PSMTabBarControl.framework/Versions/A/PSMTabBarControl has changed
diff -r 43ac932380ed -r f1b653a8defa Other/Adium Spotlight Importer/GetMetadataForHTMLLog-Additions.m
--- 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;
}
diff -r 43ac932380ed -r f1b653a8defa Plugins/Link Management/SHLinkEditorWindowController.m
--- 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
diff -r 43ac932380ed -r f1b653a8defa Resources/Credits.rtf
--- 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
-\fs24 \cf0
-\fs22 Nicholas Peshek
-\fs24 \
-\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100
-\cf0 \
+\b0 \cf0 Evan Schoenberg, M.D.\
\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
-\b\fs22 \cf0 Contributors\
+\b \cf0 \
+Contributors\
+\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
-\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
+ Alvaro Saurin Parra, mentored by Evan Schoenberg\
+\
-\b\fs22 \cf0 Webmaster\
-
-\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
+\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
+
+\fs22 \cf0 Armas
\fs20 (French)
\fs24 \
-
-\fs22 Daniel Bergman
-\fs24
+
+\fs22 Daniel Bergman
\fs20 (Swedish)
\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
+\fs20 (Russian)
+\fs24 \
+
+\fs22 Frantisek Erben
+\fs20 (Czech)
+\fs24 \
+
+\fs22 Marcos Fraz\'e3o
+\fs20 (Brazilian Portuguese)
+\fs24 \
+
+\fs22 Vasileios "tzikis" Georgitzikis
+\fs20 (Greek)
+\fs24 \
+
+\fs22 Bu\uc0\u287 ra Henden
+\fs20 (Turkish)
+\fs24 \
+
+\fs22 Kasper Hirvikoski
+\fs20 (Finnish)
+\fs24 \
+
+\fs22 Thomas Kunze
+\fs20 (German)\
+
+\fs22 Andriy "marker" Kupyna
+\fs20 (Ukrainian)
+\fs24 \
+
+\fs22 JT Lee
+\fs20 (Simplified Chinese)
+\fs24 \
+
+\fs22 Ronald Leroux
+\fs20 (French Canadian)
+\fs24 \
+
+\fs22 Jack M.H. Lin
+\fs20 (Traditional Chinese)
+\fs24 \
+
+\fs22 Mojca Miklavec
+\fs20 (Slovenian)
+\fs22 \
+ Michal Moravcik
+\fs20 (Slovakian)
+\fs24 \
+
+\fs22 Nicola "ATMB" Del Monaco
+\fs20 (Italian)
+\fs24 \
+
+\fs22 Pietro Modi
+\fs20 (Italian)
+\fs24 \
+
+\fs22 David Munch
+\fs20 (Danish)
+\fs24 \
+
+\fs22 Daisuke Okada
+\fs20 (Japanese)
+\fs24 \
+
+\fs22 Bastian Olea
+\fs20 (Spanish)
+\fs24 \
+
+\fs22 Gareth Potter
+\fs20 (Japanese)
+\fs24 \
+
+\fs22 Daniel Ramos
+\fs20 (Portugal Portuguese)
+\fs24 \
+
+\fs22 Yann Ricquebourg
+\fs20 (French Canadian)
+\fs24 \
+
+\fs22 Eion Robb
+\fs20 (Australian English)\
+
+\fs22 Jes\'fas Rodr\'edguez
+\fs20 (Spanish)
+\fs24 \
+
+\fs22 Bartosz Romanowski
+\fs20 (Polish)
+\fs24 \
+
+\fs22 Albert Samaniego
+\fs20 (Catalan)
+\fs24 \
+
+\fs22 Sebastian Sebus\'e6ter
+\fs20 (Norwegian Bokm\'e5l)
+\fs24 \
+
+\fs22 Erik S\'f8rng\'e5rd
+\fs20 (Norwegian Bokm\'e5l)
+\fs24 \
+
+\fs22 \uc0\u1040 \u1085 \u1090 \u1086 \u1085 \u1057 \u1086 \u1090 \u1082 \u1086 \u1074
+\fs20 (Russian)
+\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 biglittledragoon
-\fs24
-\fs20 (French)
-\fs24 \
-
-\fs22 Ponthus Blomquist
-\fs24
-\fs20 (Swedish)
-\b\fs24 \
+\b \cf0 Retired Lead Developers
+\b0 \
+ Adam Iser\
+ Zachary West\
+\
+
+\b Retired Project Manager\
\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
-\b0 \cf0
-\fs22 P\'e4r Boberg
-\fs20 (Swedish)
-\fs24 \
-
-\fs22 Remko Brugman
-\fs24
-\fs20 (Dutch)
-\fs24 \
-
-\fs22 \uc0\u1040 \u1083 \u1077 \u1082 \u1089 \u1072 \u1085 \u1076 \u1088 \u1041 \u1099 \u1082 \u1086 \u1074
-\fs24
-\fs20 (Russian)
-\fs24 \
-
-\fs22 Frantisek Erben
-\fs24
-\fs20 (Czech)
-\fs24 \
-
-\fs22 Marcos Fraz\'e3o
-\fs24
-\fs20 (Brazilian Portuguese)
-\fs24 \
-
-\fs22 Vasileios "tzikis" Georgitzikis
-\fs24
-\fs20 (Greek)
-\fs24 \
-
-\fs22 Bu\uc0\u287 ra Henden
-\fs24
-\fs20 (Turkish)
-\fs24 \
-
-\fs22 Kasper Hirvikoski
-\fs24
-\fs20 (Finnish)
-\fs24 \
-
-\fs22 Thomas Kunze
-\fs24
-\fs20 (German)\
-
-\fs22 Andriy "marker" Kupyna
-\fs24
-\fs20 (Ukrainian)
-\fs24 \
-
-\fs22 JT Lee
-\fs24
-\fs20 (Simplified Chinese)
-\fs24 \
-
-\fs22 Ronald Leroux
-\fs24
-\fs20 (French Canadian)
-\fs24 \
-
-\fs22 Jack M.H. Lin
-\fs24
-\fs20 (Traditional Chinese)
-\fs24 \
-
-\fs22 Mojca Miklavec
-\fs24
-\fs20 (Slovenian)
-\fs22 \
- Michal Moravcik
-\fs24
-\fs20 (Slovakian)
-\fs24 \
-
-\fs22 Nicola "ATMB" Del Monaco
-\fs24
-\fs20 (Italian)
-\fs24 \
-
-\fs22 Pietro Modi
-\fs24
-\fs20 (Italian)
-\fs24 \
-
-\fs22 David Munch
-\fs24
-\fs20 (Danish)
-\fs24 \
-
-\fs22 Daisuke Okada
-\fs24
-\fs20 (Japanese)
-\fs24 \
-
-\fs22 Bastian Olea
-\fs24
-\fs20 (Spanish)
-\fs24 \
-
-\fs22 Gareth Potter
-\fs24
-\fs20 (Japanese)
-\fs24 \
-
-\fs22 Daniel Ramo
-\fs24 s
-\fs20 (Portugal Portuguese)
-\fs24 \
-
-\fs22 Yann Ricquebourg
-\fs24
-\fs20 (French Canadian)
-\fs24 \
-
-\fs22 Eion Robb
-\fs24
-\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
-\fs20 (Spanish)
-\fs24 \
-\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
-\cf0
-\fs22 Bartosz Romanowski
-\fs24
-\fs20 (Polish)
-\fs24 \
-
-\fs22 Albert Samaniego
-\fs24
-\fs20 (Catalan)
-\fs24 \
-
-\fs22 Sebastian Sebus\'e6ter
-\fs24
-\fs20 (Norwegian Bokm\'e5l)
-\fs24 \
-
-\fs22 Erik S\'f8rng\'e5rd
-\fs24
-\fs20 (Norwegian Bokm\'e5l)
-\fs24 \
-
-\fs22 \uc0\u1040 \u1085 \u1090 \u1086 \u1085 \u1057 \u1086 \u1090 \u1082 \u1086 \u1074
-\fs24
-\fs20 (Russian)
-\fs24 \
-
-\fs22 P\'e9ter Tutervai
-\fs24
-\fs20 (Hungarian)\
-\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
-
-\fs24 \cf0 \
-\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)
-\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
+\b \cf0 Retired Translators
\fs24 \
\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
-\b0 \cf0
-\fs22 Max Bertrand
-\fs20 (French)
+\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
-\b0
-\fs22 Juan Jes\'fas Cervera
-\fs20 (Spanish)
+\fs22 \cf0
+\b0 Juan Jes\'fas Cervera
+\fs20 (Spanish)
\fs24 \
-
-\fs22 Mat\'edas Cuadros
-\fs20 (Spanish)
+\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
+
+\fs22 \cf0 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)\
-\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 NetworkRedux \'a0
+\fs20 (Adium's Hosting)\
+ <http://www.networkredux.com/>\
+
+\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)\
-\fs24
-\fs22 Penguinmilitia.net
-\fs20 \'a0(SVN Project Hosting and Email Hosting) \
+\fs22 Greg Smith \'a0
+\fs20 (Code Contributions)\
-\fs24
-\fs22 SourceForge.net
-\fs20 \'a0(Project Hosting)
+\fs22 Vinay Venkatesh \'a0
+\fs20 (Code Contributions)\
+
+\fs22 AmbitiousLemon.com \'a0
+\fs20 (FunMac Adium Forums Hosting)
\fs24 \
-\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100
+
+\fs22 New York Internet \'a0
+\fs20 (1.x Site Hosting)\
More information about the commits
mailing list