--- editor.errorstripe/src/org/netbeans/modules/editor/errorstripe/Bundle.properties	
+++ editor.errorstripe/src/org/netbeans/modules/editor/errorstripe/Bundle.properties	
@@ -45,14 +45,14 @@ 
 TP_NoErrors=No errors
 
 #{0}: number of warnings
-TP_X_warning(s)={0} warning(s)
+TP_X_warning(s)={0} {0,choice,0#warnings|1#warning|1<warnings}
 
 #{0}: number of errors
-TP_X_error(s)={0}  error(s)
+TP_X_error(s)={0} {0,choice,0#errors|1#error|1<errors}
 
 #{0}: number of errors
 #{1}: number of warnings
-TP_X_error(s)_Y_warning(s)={0} error(s), {1} warning(s)
+TP_X_error(s)_Y_warning(s)={0} {0,choice,0#errors|1#error|1<errors}, {1,choice,0#warnings|1#warning|1<warnings}
 
 TP_Current_Line=Current Line