- Merge in changes from FeedbackReporter framework master up to 9bcc34dd34396f9e0285f96a148c2071c52e7abb, including localisation improvements and code cleanu$

 - Disable retrieval of user's "Me" card from the address book to avoid Security warnings about accessing Contacts on 10.8

20 files changed, 11 insertions, 3 deletions

diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/FeedbackReporter b/Frameworks/FeedbackReporter.framework/Versions/A/FeedbackReporter
index 67f472ab..722fd73e 100755
--- a/Frameworks/FeedbackReporter.framework/Versions/A/FeedbackReporter
+++ b/Frameworks/FeedbackReporter.framework/Versions/A/FeedbackReporter
diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Headers/FRFeedbackReporter.h b/Frameworks/FeedbackReporter.framework/Versions/A/Headers/FRFeedbackReporter.h
index e1ffe927..954f7ce1 100644
--- a/Frameworks/FeedbackReporter.framework/Versions/A/Headers/FRFeedbackReporter.h
+++ b/Frameworks/FeedbackReporter.framework/Versions/A/Headers/FRFeedbackReporter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008, Torsten Curdt
+ * Copyright 2008-2011, Torsten Curdt
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,12 @@
 
 #import <Cocoa/Cocoa.h>
 
-@protocol FRFeedbackReporterDelegate
+@protocol FRFeedbackReporterDelegate <NSObject>
 @optional
 - (NSDictionary*) customParametersForFeedbackReport;
 - (NSMutableDictionary*) anonymizePreferencesForFeedbackReport:(NSMutableDictionary *)preferences;
+- (NSString *) targetUrlForFeedbackReport;
+- (NSString *) feedbackDisplayName;
 @end
 
 @interface FRFeedbackReporter : NSObject {
@@ -29,14 +31,20 @@
         id<FRFeedbackReporterDelegate> delegate;
 }
 
+// Creates and returns the singleton FRFeedbackReporter. Does not perform any checks or other real work.
 + (FRFeedbackReporter *)sharedReporter;
 
+// Gets/sets the delegate.
 - (id<FRFeedbackReporterDelegate>) delegate;
 - (void) setDelegate:(id<FRFeedbackReporterDelegate>) delegate;
 
+// Displays the feedback user interface allowing the user to provide general feedback. Returns YES if it was able to display the UI, NO otherwise.
 - (BOOL) reportFeedback;
+
+// Searches the disk for crash logs, and displays the feedback user interface if there are crash logs newer than since the last check. Updates the 'last crash check date' in user defaults. Returns YES if it was able to display the UI, NO otherwise.
 - (BOOL) reportIfCrash;
+
+// Displays the feedback user interface for the given exception. Do not pass nil. Returns YES if it was able to display the UI, NO otherwise.
 - (BOOL) reportException:(NSException *)exception;
 
 @end
-
diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/FeedbackReporter.nib b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/FeedbackReporter.nib
deleted file mode 100644
index 7804229c..00000000
--- a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/FeedbackReporter.nib
+++ /dev/null
diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/Russian.lproj/FeedbackReporter.strings b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/Russian.lproj/FeedbackReporter.strings
deleted file mode 100644
index 176a0824..00000000
--- a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/Russian.lproj/FeedbackReporter.strings
+++ /dev/null
diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/ar.lproj/FeedbackReporter.nib b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/ar.lproj/FeedbackReporter.nib
new file mode 100644
index 00000000..a7a275a1
--- /dev/null
+++ b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/ar.lproj/FeedbackReporter.nib
diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/ar.lproj/FeedbackReporter.strings b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/ar.lproj/FeedbackReporter.strings
new file mode 100644
index 00000000..ced0d67e
--- /dev/null
+++ b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/ar.lproj/FeedbackReporter.strings
diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/de.lproj/FeedbackReporter.nib b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/de.lproj/FeedbackReporter.nib
new file mode 100644
index 00000000..e970f2a5
--- /dev/null
+++ b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/de.lproj/FeedbackReporter.nib
diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/German.lproj/FeedbackReporter.strings b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/de.lproj/FeedbackReporter.strings
index 2c55a954..95992eb1 100644
--- a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/German.lproj/FeedbackReporter.strings
+++ b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/de.lproj/FeedbackReporter.strings
diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/en.lproj/FeedbackReporter.nib b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/en.lproj/FeedbackReporter.nib
new file mode 100644
index 00000000..a7a275a1
--- /dev/null
+++ b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/en.lproj/FeedbackReporter.nib
diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/English.lproj/FeedbackReporter.strings b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/en.lproj/FeedbackReporter.strings
index d52f8111..3e6260ae 100644
--- a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/English.lproj/FeedbackReporter.strings
+++ b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/en.lproj/FeedbackReporter.strings
diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/es.lproj/FeedbackReporter.nib b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/es.lproj/FeedbackReporter.nib
new file mode 100644
index 00000000..a7a275a1
--- /dev/null
+++ b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/es.lproj/FeedbackReporter.nib
diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/es.lproj/FeedbackReporter.strings b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/es.lproj/FeedbackReporter.strings
new file mode 100644
index 00000000..40e4ada7
--- /dev/null
+++ b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/es.lproj/FeedbackReporter.strings
diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/fr.lproj/FeedbackReporter.nib b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/fr.lproj/FeedbackReporter.nib
new file mode 100644
index 00000000..a7a275a1
--- /dev/null
+++ b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/fr.lproj/FeedbackReporter.nib
diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/fr.lproj/FeedbackReporter.strings b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/fr.lproj/FeedbackReporter.strings
new file mode 100644
index 00000000..76259853
--- /dev/null
+++ b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/fr.lproj/FeedbackReporter.strings
diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/hy.lproj/FeedbackReporter.nib b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/hy.lproj/FeedbackReporter.nib
new file mode 100644
index 00000000..a7a275a1
--- /dev/null
+++ b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/hy.lproj/FeedbackReporter.nib
diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/Armenian.lproj/FeedbackReporter.strings b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/hy.lproj/FeedbackReporter.strings
index f48cf8b3..06c2503b 100644
--- a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/Armenian.lproj/FeedbackReporter.strings
+++ b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/hy.lproj/FeedbackReporter.strings
diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/it.lproj/FeedbackReporter.nib b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/it.lproj/FeedbackReporter.nib
new file mode 100644
index 00000000..a7a275a1
--- /dev/null
+++ b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/it.lproj/FeedbackReporter.nib
diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/Italian.lproj/FeedbackReporter.strings b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/it.lproj/FeedbackReporter.strings
index 504ad6c2..dea6fb69 100644
--- a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/Italian.lproj/FeedbackReporter.strings
+++ b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/it.lproj/FeedbackReporter.strings
diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/ru.lproj/FeedbackReporter.nib b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/ru.lproj/FeedbackReporter.nib
new file mode 100644
index 00000000..e970f2a5
--- /dev/null
+++ b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/ru.lproj/FeedbackReporter.nib
diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/ru.lproj/FeedbackReporter.strings b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/ru.lproj/FeedbackReporter.strings
new file mode 100644
index 00000000..95992eb1
--- /dev/null
+++ b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/ru.lproj/FeedbackReporter.strings