4 files changed, 24 insertions, 12 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 7bec433d08..7894965a59 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,17 @@
 2017-08-03  Mike FABIAN  <mfabian@redhat.com>
 
+	For the locales doi_IN,  kok_IN, and sat_IN, the words for
+	“yes” and “no” were apparently in yesexpr and noexpr.
+	Copy them from there to add yesstr and nostr.
+	Also make yesexpr and noexpr more readable by using
+	the POSIX portable character set.
+
+	* locales/doi_IN (LC_MESSAGES): Add yesstr and nostr.
+	* locales/kok_IN (LC_MESSAGES): Add yesstr and nostr.
+	* locales/sat_IN (LC_MESSAGES): Add yesstr and nostr.
+
+2017-08-03  Mike FABIAN  <mfabian@redhat.com>
+
 	Revert “Fix yesexpr in en_DK locale”.
 
 	* locales/en_DK (LC_MESSAGES): Restore original yesexpr, noexpr,
diff --git a/localedata/locales/doi_IN b/localedata/locales/doi_IN
index 8a7951508a..db215bc7dd 100644
--- a/localedata/locales/doi_IN
+++ b/localedata/locales/doi_IN
@@ -136,10 +136,10 @@ END LC_TIME
 
 
 LC_MESSAGES
-yesexpr "<U005E><U0028><U0911><U0939><U007C><U005B><U002B><U0031><U0079>/
-<U0059><U005D><U0029>"
-noexpr  "<U005E><U0028><U0928><U093E><U007C><U005B><U002D><U0030><U006E>/
-<U004E><U005D><U0029>"
+yesexpr "^(<U0911><U0939>|[+1yY])"
+noexpr  "^(<U0928><U093E>|[-0nN])"
+yesstr  "<U0911><U0939>"
+nostr   "<U0928><U093E>"
 END LC_MESSAGES
 
 LC_PAPER
diff --git a/localedata/locales/kok_IN b/localedata/locales/kok_IN
index dbd486ea57..3353a6039a 100644
--- a/localedata/locales/kok_IN
+++ b/localedata/locales/kok_IN
@@ -154,10 +154,10 @@ END LC_TIME
 
 
 LC_MESSAGES
-yesexpr "<U005E><U0028><U0939><U092F><U007C><U005B><U002B><U0031><U0079>/
-<U0059><U005D><U0029>"
-noexpr  "<U005E><U0028><U0928><U094D><U0939><U0940><U007C><U005B><U002D>/
-<U0030><U006E><U004E><U005D><U0029>"
+yesexpr "^(<U0939><U092F>|[+1yY])"
+noexpr  "^(<U0928><U094D><U0939><U0940>|[-0nN])"
+yesstr "<U0939><U092F>"
+nostr  "<U0928><U094D><U0939><U0940>"
 END LC_MESSAGES
 
 
diff --git a/localedata/locales/sat_IN b/localedata/locales/sat_IN
index 0d58474f02..e460f7471f 100644
--- a/localedata/locales/sat_IN
+++ b/localedata/locales/sat_IN
@@ -136,10 +136,10 @@ END LC_TIME
 
 
 LC_MESSAGES
-yesexpr "<U005E><U0028><U0939><U094B><U092F><U007C><U005B><U002B><U0031>/
-<U0079><U0059><U005D><U0029>"
-noexpr  "<U005E><U0028><U092C><U093E><U0919><U007C><U005B><U002D><U0030>/
-<U006E><U004E><U005D><U0029>"
+yesexpr "^(<U0939><U094B><U092F>|[+1yY])"
+noexpr  "^(<U092C><U093E><U0919>|[-0nN])"
+yesstr  "<U0939><U094B><U092F>"
+nostr   "<U092C><U093E><U0919>"
 END LC_MESSAGES