Merge https://github.com/scrod/nv into scrod

* https://github.com/scrod/nv:
  update sparkle localizations for current NV localizations
  directly initialize prefixParentNotes with the note object; common case is a single prefixparent
  if UTF8String fails while generating cstring caches, then try other methods
  add Sparanoid's graciously donated Chinese localization
  CREATE Chinese Simplified language
  get back in there, ServicesMenu.strings
  I changed my mind; I don't want the tags column initially visible.
  to ensure custom-builds can upgrade
  to ensure custom-builds can upgrade
  ensure the presence of a ServicesMenu strings file to prevent failing-over to other localizations in 10.4

English.lproj/ServicesMenu.strings

@@ -0,0 +1 @@
+"NV: New Note With Selection" = "NV: New Note With Selection";

GlobalPrefs.m

@@ -132,7 +132,7 @@ - (id)init {
 			 [NSColor colorWithCalibratedRed:0.945 green:0.702 blue:0.702 alpha:1.0f]], SearchTermHighlightColorKey,
 
 			[NSNumber numberWithFloat:[NSFont smallSystemFontSize]], TableFontSizeKey, 
-			[NSArray arrayWithObjects:NoteTitleColumnString, NoteLabelsColumnString, NoteDateModifiedColumnString, nil], NoteAttributesVisibleKey,
+			[NSArray arrayWithObjects:NoteTitleColumnString, NoteDateModifiedColumnString, nil], NoteAttributesVisibleKey,
 			NoteDateModifiedColumnString, TableSortColumnKey,
 			[NSNumber numberWithBool:YES], TableIsReverseSortedKey, nil]];
 

NSString_NV.m

@@ -485,6 +485,24 @@ - (const char*)lowercaseUTF8String {
 
 	const char *utf8String = [(NSString*)str2 UTF8String];
 
+	if (!utf8String) {
+
+		CFStringEncoding encoding = CFStringGetFastestEncoding(str2);
+		const char *cStrPtr = CFStringGetCStringPtr(str2, encoding);
+
+		if (cStrPtr && (kCFStringEncodingUTF8 == encoding || (encoding & 0x0100) == 0)) {
+			//-UTF8String failed, but the native cstringptr worked and was not a UTF16+ encoding
+			//so return that instead, forfeiting upper-ascii searchability for now
+			//(for whatever reason, native string encoding is almost never kCFStringEncodingUTF8, so CFStringGetFastestEncoding is called only if necessary)
+			utf8String = cStrPtr;
+
+		} else {
+			//-UTF8String failed and CFStringGetCStringPtr was not a good fallback; try lossy MacOSRoman and pray
+			NSMutableData *nullTerminatedData = [[[(NSString*)str2 dataUsingEncoding:NSMacOSRomanStringEncoding allowLossyConversion:YES] mutableCopy] autorelease];
+			[nullTerminatedData appendBytes:"\0" length:1];
+			utf8String = [nullTerminatedData bytes];
+		}
+	}
 	CFRelease(str2);
 	return utf8String;
 }

NoteObject.m

@@ -1792,9 +1792,10 @@ BOOL noteTitleIsAPrefixOfOtherNoteTitle(NoteObject *longerNote, NoteObject *shor
 
 - (void)addPrefixParentNote:(NoteObject*)aNote {
 	if (!prefixParentNotes) {
-		prefixParentNotes = [[NSMutableArray alloc] init];
+		prefixParentNotes = [[NSMutableArray alloc] initWithObjects:&aNote count:1];
+	} else {
+		[prefixParentNotes addObject:aNote];
 	}
-	[prefixParentNotes addObject:aNote];
 }
 - (void)removeAllPrefixParentNotes {
 	[prefixParentNotes removeAllObjects];

PTHotKeys/PTKeyComboPanel.m

@@ -61,7 +61,7 @@ - (void)_refreshContents
 
 
 	if( mTitleField )
-		[mTitleField setStringValue: [NSString stringWithFormat: mTitleFormat, mKeyName]];
+		[mTitleField setStringValue: mTitleFormat];
 
 }