[Author: thomasvl]

- Support for localizing non datasource versions of NSComboxBox (http://code.google.com/p/google-toolbox-for-mac/issues/detail?id=77).
- Fix up some category names.
- Avoid conflicting category names.
- Move placeholder string support down to NSTextField instead of NSSearchField.
- Support for NSTextField placeholder in unittesting state.
- Support for non datasource combobox values in unittesting state.
- Fix NSSegmentControl localization support.
- Add explicit tests for no localized values and document it in the strings file.
- Unittesting for as much as possible of the above.

R=dmaclach
DELTA=762  (660 added, 55 deleted, 47 changed)

3 files changed, 88 insertions, 2 deletions

diff --git a/AppKit/TestData/GTMUILocalizerWindow3State.10_4_SDK.gtmUTState b/AppKit/TestData/GTMUILocalizerWindow3State.10_4_SDK.gtmUTState
index ed88b68..ea1d10c 100644
--- a/AppKit/TestData/GTMUILocalizerWindow3State.10_4_SDK.gtmUTState
+++ b/AppKit/TestData/GTMUILocalizerWindow3State.10_4_SDK.gtmUTState
@@ -293,6 +293,46 @@
 				<false/>
 			</dict>
 		</dict>
+		<key>ViewSubView 3</key>
+		<dict>
+			<key>ComboBoxNumberOfItems</key>
+			<integer>5</integer>
+			<key>ComboBoxNumberOfVisibleItems</key>
+			<integer>4</integer>
+			<key>ComboBoxObjectValue 0</key>
+			<string>Localized Choice 1</string>
+			<key>ComboBoxObjectValue 1</key>
+			<string>Localized Choice 2</string>
+			<key>ComboBoxObjectValue 2</key>
+			<string>Localized Choice 3</string>
+			<key>ComboBoxObjectValue 3</key>
+			<string>^Choice4</string>
+			<key>ComboBoxObjectValue 4</key>
+			<string>^Choice5</string>
+			<key>ControlIsEnabled</key>
+			<true/>
+			<key>ControlSelectedCell</key>
+			<dict>
+				<key>CellState</key>
+				<integer>0</integer>
+				<key>CellTag</key>
+				<integer>0</integer>
+				<key>CellTitle</key>
+				<string>Localized Label</string>
+				<key>CellValue</key>
+				<string>Localized Label</string>
+			</dict>
+			<key>ControlTag</key>
+			<integer>0</integer>
+			<key>ControlType</key>
+			<string>NSComboBox</string>
+			<key>ControlValue</key>
+			<string>Localized Label</string>
+			<key>PlaceHolderString</key>
+			<string>Localized Placeholder</string>
+			<key>ViewIsHidden</key>
+			<false/>
+		</dict>
 	</dict>
 	<key>WindowIsMain</key>
 	<false/>
diff --git a/AppKit/TestData/GTMUILocalizerWindow3State.gtmUTState b/AppKit/TestData/GTMUILocalizerWindow3State.gtmUTState
index 8352b5e..6958e6e 100644
--- a/AppKit/TestData/GTMUILocalizerWindow3State.gtmUTState
+++ b/AppKit/TestData/GTMUILocalizerWindow3State.gtmUTState
@@ -319,12 +319,52 @@
 			<key>Segment 1</key>
 			<string>Localized Segment 2</string>
 			<key>Segment 2</key>
-			<string>Localized Segment 3</string>
+			<string>^Seg3</string>
 			<key>SegmentCount</key>
 			<integer>3</integer>
 			<key>ViewIsHidden</key>
 			<false/>
 		</dict>
+		<key>ViewSubView 4</key>
+		<dict>
+			<key>ComboBoxNumberOfItems</key>
+			<integer>5</integer>
+			<key>ComboBoxNumberOfVisibleItems</key>
+			<integer>4</integer>
+			<key>ComboBoxObjectValue 0</key>
+			<string>Localized Choice 1</string>
+			<key>ComboBoxObjectValue 1</key>
+			<string>Localized Choice 2</string>
+			<key>ComboBoxObjectValue 2</key>
+			<string>Localized Choice 3</string>
+			<key>ComboBoxObjectValue 3</key>
+			<string>^Choice4</string>
+			<key>ComboBoxObjectValue 4</key>
+			<string>^Choice5</string>
+			<key>ControlIsEnabled</key>
+			<true/>
+			<key>ControlSelectedCell</key>
+			<dict>
+				<key>CellState</key>
+				<integer>0</integer>
+				<key>CellTag</key>
+				<integer>0</integer>
+				<key>CellTitle</key>
+				<string>Localized Label</string>
+				<key>CellValue</key>
+				<string>Localized Label</string>
+			</dict>
+			<key>ControlTag</key>
+			<integer>0</integer>
+			<key>ControlType</key>
+			<string>NSComboBox</string>
+			<key>ControlValue</key>
+			<string>Localized Label</string>
+			<key>PlaceHolderString</key>
+			<string>Localized Placeholder</string>
+			<key>ViewIsHidden</key>
+			<false/>
+		</dict>
 	</dict>
 	<key>WindowIsMain</key>
 	<false/>
diff --git a/AppKit/TestData/Resources/English.lproj/Localizable.strings b/AppKit/TestData/Resources/English.lproj/Localizable.strings
index e6452a8..b45dc87 100644
--- a/AppKit/TestData/Resources/English.lproj/Localizable.strings
+++ b/AppKit/TestData/Resources/English.lproj/Localizable.strings
@@ -16,6 +16,9 @@
 //  the License.
 //
 
+// NOTE: Some things in the UI aren't here to confirm that they get left
+// along instead of replaced with an empty string.
+
 // GTMUILocalizerTest strings
 "Button1" = "Localized Button";
 "Label1" = "Localized Label";
@@ -39,7 +42,10 @@
 "Box" = "Localized Box";
 "Seg1" = "Localized Segment 1";
 "Seg2" = "Localized Segment 2";
-"Seg3" = "Localized Segment 3";
+"Choice1" = "Localized Choice 1";
+"Choice2" = "Localized Choice 2";
+"Choice3" = "Localized Choice 3";
+"Placeholder1" = "Localized Placeholder";
 
 // Binding localization strings.
 "MultipleValuesPlaceholder" = "MultipleValuesPlaceholder";