3 files changed, 43 insertions, 24 deletions
diff --git a/src/core/lombok/ConfigurationKeys.java b/src/core/lombok/ConfigurationKeys.java
index 0fe23d7b..9b7c6c0a 100644
--- a/src/core/lombok/ConfigurationKeys.java
+++ b/src/core/lombok/ConfigurationKeys.java
@@ -167,6 +167,32 @@ public class ConfigurationKeys {
 	 */
 	public static final ConfigurationKey<Boolean> TO_STRING_INCLUDE_FIELD_NAMES = new ConfigurationKey<Boolean>("lombok.toString.includeFieldNames", "Include the field names in the generated toString method (default = true).") {};
 	
+	// ----- Builder -----
+	
+	/**
+	 * lombok configuration: {@code lombok.builder.flagUsage} = {@code WARNING} | {@code ERROR}.
+	 * 
+	 * If set, <em>any</em> usage of {@code @Builder} results in a warning / error.
+	 */
+	public static final ConfigurationKey<FlagUsageType> BUILDER_FLAG_USAGE = new ConfigurationKey<FlagUsageType>("lombok.builder.flagUsage", "Emit a warning or error if @Builder is used.") {};
+	
+	/**
+	 * lombok configuration: {@code lombok.builder.useGuava} = {@code true} | {@code false}.
+	 * 
+	 * If explicitly set to {@code true}, guava's {@code ImmutableList} etc are used to implement the immutable collection datatypes generated by @Singular @Builder for fields/parameters of type {@code java.util.List} and such.
+	 * By default, unmodifiable-wrapped versions of {@code java.util} types are used.
+	 */
+	public static final ConfigurationKey<Boolean> BUILDER_USE_GUAVA = new ConfigurationKey<Boolean>("lombok.builder.useGuava", "Generate backing immutable implementations for @Singular on java.util.* types by using guava's ImmutableList, etc. Normally java.util's mutable types are used and wrapped to make them immutable.") {}; 
+	
+	// ----- Singular -----
+	
+	/**
+	 * lombok configuration: {@code lombok.singular.auto} = {@code true} | {@code false}.
+	 * 
+	 * By default or if explicitly set to {@code true}, lombok will attempt to automatically singularize the name of your variable/parameter when using {@code @Singular}; the name is assumed to be written in english, and a plural. If explicitly to {@code false}, you must always specify the singular form; this is especially useful if your identifiers are in a foreign language.
+	 */
+	public static final ConfigurationKey<Boolean> SINGULAR_AUTO = new ConfigurationKey<Boolean>("lombok.singular.auto", "If true (default): Automatically singularize the assumed-to-be-plural name of your variable/parameter when using {@code @Singular}.") {}; 
+	
 	// ##### Standalones #####
 	
 	// ----- Cleanup -----
@@ -340,23 +366,6 @@ public class ConfigurationKeys {
 	 */
 	public static final ConfigurationKey<Boolean> ACCESSORS_FLUENT = new ConfigurationKey<Boolean>("lombok.accessors.fluent", "Generate getters and setters using only the field name (no get/set prefix) (default: false).") {};
 	
-	// ----- Builder -----
-	
-	/**
-	 * lombok configuration: {@code lombok.builder.flagUsage} = {@code WARNING} | {@code ERROR}.
-	 * 
-	 * If set, <em>any</em> usage of {@code @Builder} results in a warning / error.
-	 */
-	public static final ConfigurationKey<FlagUsageType> BUILDER_FLAG_USAGE = new ConfigurationKey<FlagUsageType>("lombok.builder.flagUsage", "Emit a warning or error if @Builder is used.") {};
-	
-	/**
-	 * lombok configuration: {@code lombok.builder.useGuava} = {@code true} | {@code false}.
-	 * 
-	 * If explicitly set to {@code true}, guava's {@code ImmutableList} etc are used to implement the immutable collection datatypes generated by @Singular @Builder for fields/parameters of type {@code java.util.List} and such.
-	 * By default, unmodifiable-wrapped versions of {@code java.util} types are used.
-	 */
-	public static final ConfigurationKey<Boolean> BUILDER_USE_GUAVA = new ConfigurationKey<Boolean>("lombok.builder.useGuava", "Generate backing immutable implementations for @Singular on java.util.* types by using guava's ImmutableList, etc. Normally java.util's mutable types are used and wrapped to make them immutable.") {}; 
-	
 	// ----- ExtensionMethod -----
 	
 	/**
diff --git a/src/core/lombok/eclipse/handlers/HandleBuilder.java b/src/core/lombok/eclipse/handlers/HandleBuilder.java
index 91aa3f93..498808bc 100644
--- a/src/core/lombok/eclipse/handlers/HandleBuilder.java
+++ b/src/core/lombok/eclipse/handlers/HandleBuilder.java
@@ -516,10 +516,15 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> {
 				AnnotationValues<Singular> ann = createAnnotation(Singular.class, child);
 				String explicitSingular = ann.getInstance().value();
 				if (explicitSingular.isEmpty()) {
-					explicitSingular = autoSingularize(node.getName());
-					if (explicitSingular == null) {
-						node.addError("Can't singularize this name; please specify the singular explicitly (i.e. @Singular(\"sheep\"))");
-						explicitSingular = pluralName.toString();
+					if (Boolean.FALSE.equals(node.getAst().readConfiguration(ConfigurationKeys.SINGULAR_AUTO))) {
+						node.addError("The singular must be specified explicitly (e.g. @Singular(\"task\")) because auto singularization is disabled.");
+						explicitSingular = new String(pluralName);
+					} else {
+						explicitSingular = autoSingularize(node.getName());
+						if (explicitSingular == null) {
+							node.addError("Can't singularize this name; please specify the singular explicitly (i.e. @Singular(\"sheep\"))");
+							explicitSingular = new String(pluralName);
+						}
 					}
 				}
 				char[] singularName = explicitSingular.toCharArray();
diff --git a/src/core/lombok/javac/handlers/HandleBuilder.java b/src/core/lombok/javac/handlers/HandleBuilder.java
index 7bb0619f..e251e0ce 100644
--- a/src/core/lombok/javac/handlers/HandleBuilder.java
+++ b/src/core/lombok/javac/handlers/HandleBuilder.java
@@ -466,10 +466,15 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
 				deleteAnnotationIfNeccessary(child, Singular.class);
 				String explicitSingular = ann.getInstance().value();
 				if (explicitSingular.isEmpty()) {
-					explicitSingular = autoSingularize(node.getName());
-					if (explicitSingular == null) {
-						node.addError("Can't singularize this name; please specify the singular explicitly (i.e. @Singular(\"sheep\"))");
+					if (Boolean.FALSE.equals(node.getAst().readConfiguration(ConfigurationKeys.SINGULAR_AUTO))) {
+						node.addError("The singular must be specified explicitly (e.g. @Singular(\"task\")) because auto singularization is disabled.");
 						explicitSingular = pluralName.toString();
+					} else {
+						explicitSingular = autoSingularize(node.getName());
+						if (explicitSingular == null) {
+							node.addError("Can't singularize this name; please specify the singular explicitly (i.e. @Singular(\"sheep\"))");
+							explicitSingular = pluralName.toString();
+						}
 					}
 				}
 				Name singularName = node.toName(explicitSingular);