From 7aac3aeef385f3e21a4fb992a7e0764cd0f27f8f Mon Sep 17 00:00:00 2001
From: Carlos O'Donell <carlos@redhat.com>
Date: Fri, 7 Jul 2023 13:09:04 -0400
Subject: [PATCH] Update ESTALE error message translations (RHEL-729)

Resolves: RHEL-729
---
 glibc-RHEL-729.patch | 54 ++++++++++++++++++++++++++++++++++++++++++++
 glibc.spec           |  6 ++++-
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 glibc-RHEL-729.patch

diff --git a/glibc-RHEL-729.patch b/glibc-RHEL-729.patch
new file mode 100644
index 0000000..6999dc5
--- /dev/null
+++ b/glibc-RHEL-729.patch
@@ -0,0 +1,54 @@
+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 abd762b6e383008b..4c62751a92b15e64 100644
+--- a/po/it.po
++++ b/po/it.po
+@@ -5692,6 +5692,15 @@ msgstr "Troppi utenti"
+ msgid "Disk quota exceeded"
+ msgstr "Quota disco superata"
+ 
++#. TRANS This indicates an internal confusion in the
++#. TRANS file system which is due to file system rearrangements on the server host
++#. TRANS for NFS file systems or corruption in other file systems.
++#. TRANS Repairing this condition usually requires unmounting, possibly repairing
++#. TRANS and remounting the file system.
++#: sysdeps/gnu/errlist.h:471
++msgid "Stale file handle"
++msgstr "Riferimento al file obsoleto"
++
+ # lf
+ #. 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/po/ja.po b/po/ja.po
+index 87ceb0abb22507b0..07d90ba0205f7065 100644
+--- a/po/ja.po
++++ b/po/ja.po
+@@ -5279,6 +5279,15 @@ msgstr "ユーザが多すぎます"
+ msgid "Disk quota exceeded"
+ msgstr "ディスク使用量制限を超過しました"
+ 
++#. TRANS This indicates an internal confusion in the
++#. TRANS file system which is due to file system rearrangements on the server host
++#. TRANS for NFS file systems or corruption in other file systems.
++#. TRANS Repairing this condition usually requires unmounting, possibly repairing
++#. TRANS and remounting the file system.
++#: sysdeps/gnu/errlist.h:471
++msgid "Stale file handle"
++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.
+ #. TRANS (This is an error on some operating systems, but we expect it to work
diff --git a/glibc.spec b/glibc.spec
index 2d4bb99..a2c8507 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -155,7 +155,7 @@ end \
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 71%{?dist}
+Release: 72%{?dist}
 
 # In general, GPLv2+ is used by programs, LGPLv2+ is used for
 # libraries.
@@ -725,6 +725,7 @@ Patch484: glibc-upstream-2.34-397.patch
 Patch485: glibc-rh2215368.patch
 Patch486: glibc-rh2213908.patch
 Patch487: glibc-rh2189923.patch
+Patch488: glibc-RHEL-729.patch
 
 ##############################################################################
 # Continued list of core "glibc" package information:
@@ -2882,6 +2883,9 @@ update_gconv_modules_cache ()
 %endif
 
 %changelog
+* Fri Jul 07 2023 Carlos O'Donell <carlos@redhat.com> - 2.34-72
+- Update ESTALE error message translations (RHEL-729)
+
 * Fri Jul 07 2023 Carlos O'Donell <carlos@redhat.com> - 2.34-71
 - Avoid lazy binding failures during dlclose (#2189923)