From a7237924afb8d7b940bcc26b5e9e28022e46feb1 Mon Sep 17 00:00:00 2001
From: Carlos O'Donell <carlos@redhat.com>
Date: Sun, 9 Jul 2023 13:33:08 -0400
Subject: [PATCH] Update ESTALE error message translations (#2186781)

Resolves: #2186781
---
 glibc-rh2186781.patch | 46 +++++++++++++++++++++++++++++++++++++++++++
 glibc.spec            |  6 +++++-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 glibc-rh2186781.patch

diff --git a/glibc-rh2186781.patch b/glibc-rh2186781.patch
new file mode 100644
index 0000000..9c848c7
--- /dev/null
+++ b/glibc-rh2186781.patch
@@ -0,0 +1,46 @@
+Only backport po/it.po and po/ja.po changes for the ESTALE message
+translation which we use during CI testing.
+
+commit 7ff33eca6860648fb909df954da4996ce853d01d
+Author: Carlos O'Donell <carlos@redhat.com>
+Date:   Fri Jul 7 11:27:08 2023 -0400
+
+    Translations: Add new ro support and update others.
+
+    This brings in the new Romanian language translations, and updates
+    nine other translations. Important translations in this update
+    include the Italian and Japanese translations for ESTALE which
+    remove the mention of "NFS" from the error message translation.
+
+diff --git a/po/it.po b/po/it.po
+index 2750575a1082f1db..6c2be3a4df5611ff 100644
+--- a/po/it.po
++++ b/po/it.po
+@@ -6793,10 +6793,8 @@ msgstr "Quota disco superata"
+ #. TRANS Repairing this condition usually requires unmounting, possibly repairing
+ #. TRANS and remounting the file system.
+ #: sysdeps/gnu/errlist.c:788
+-#, fuzzy
+-#| msgid "Stale NFS file handle"
+ msgid "Stale file handle"
+-msgstr "Gestione del file NFS interrotta"
++msgstr "Riferimento al file obsoleto"
+ 
+ # lf
+ #. TRANS An attempt was made to NFS-mount a remote file system with a file name that
+diff --git a/po/ja.po b/po/ja.po
+index bd9b7ffbbd3e3bf6..8fb598c5edbc5891 100644
+--- a/po/ja.po
++++ b/po/ja.po
+@@ -6360,10 +6360,8 @@ msgstr "ディスク使用量制限を超過しました"
+ #. TRANS Repairing this condition usually requires unmounting, possibly repairing
+ #. TRANS and remounting the file system.
+ #: sysdeps/gnu/errlist.c:788
+-#, fuzzy
+-#| msgid "Stale NFS file handle"
+ msgid "Stale file handle"
+-msgstr "実効性のないNFSファイルハンドルです"
++msgstr "古いファイルハンドルです"
+ 
+ #. TRANS An attempt was made to NFS-mount a remote file system with a file name that
+ #. TRANS already specifies an NFS-mounted file.
diff --git a/glibc.spec b/glibc.spec
index 5bd5edc..deaa55d 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
 %define glibcsrcdir glibc-2.28
 %define glibcversion 2.28
-%define glibcrelease 230%{?dist}
+%define glibcrelease 231%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -1040,6 +1040,7 @@ Patch847: glibc-rh2180155-3.patch
 Patch848: glibc-rh2213909.patch
 Patch849: glibc-rh2176707-1.patch
 Patch850: glibc-rh2176707-2.patch
+Patch851: glibc-rh2186781.patch
 
 ##############################################################################
 # Continued list of core "glibc" package information:
@@ -2870,6 +2871,9 @@ fi
 %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
 
 %changelog
+* Sun Jul  9 2023 Carlos O'Donell <carlos@redhat.com> - 2.28-231
+- Update ESTALE error message translations (#2186781)
+
 * Fri Jul 7 2023 DJ Delorie <dj@redhat.com> - 2.28-230
 - Don't block SIGCHILD when system() is called concurrently (#2176707)