e181ee1.patch 9.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270
  1. From e181ee115e727b4754619b04aa6e8ad872113592 Mon Sep 17 00:00:00 2001
  2. From: David Seifert <soap@gentoo.org>
  3. Date: Fri, 30 Jun 2023 15:35:12 +0200
  4. Subject: [PATCH] Replace obsolescent `%hs` printf specifier
  5. * `%hs` is not defined by C:
  6. https://wiki.sei.cmu.edu/confluence/display/c/FIO47-C.+Use+valid+format+strings
  7. * Fixes translations for gettext 0.22
  8. Bug: https://bugs.gentoo.org/909201
  9. Closes: #4847
  10. ---
  11. locale/ar.po | 2 +-
  12. locale/be.po | 6 +++---
  13. locale/bg.po | 2 +-
  14. locale/ca.po | 2 +-
  15. locale/ca_ES@valencia.po | 2 +-
  16. locale/fa.po | 4 ++--
  17. locale/gl.po | 2 +-
  18. locale/hr.po | 2 +-
  19. locale/hy.po | 2 +-
  20. locale/id.po | 2 +-
  21. locale/km.po | 4 ++--
  22. locale/ro.po | 2 +-
  23. locale/sr_RS@latin.po | 2 +-
  24. locale/ta.po | 2 +-
  25. locale/tg.po | 4 ++--
  26. 15 files changed, 20 insertions(+), 20 deletions(-)
  27. diff --git a/locale/ar.po b/locale/ar.po
  28. index 2abe618f516f..40f60e068074 100644
  29. --- a/locale/ar.po
  30. +++ b/locale/ar.po
  31. @@ -2304,7 +2304,7 @@ msgstr "لم أتمكن من فتح ملف: \"%s\""
  32. #: libraries/lib-xml/XMLFileReader.cpp
  33. #, fuzzy, c-format
  34. msgid "Error: %s at line %lu"
  35. -msgstr "خطأ: %hs عند خط %lu"
  36. +msgstr "خطأ: %s عند خط %lu"
  37. #: libraries/lib-xml/XMLFileReader.cpp
  38. #, c-format
  39. diff --git a/locale/be.po b/locale/be.po
  40. index 017d1d67ded0..4ae28b8e410b 100644
  41. --- a/locale/be.po
  42. +++ b/locale/be.po
  43. @@ -2320,7 +2320,7 @@ msgstr "Не атрымалася адкрыць файл: \"%s\""
  44. #: libraries/lib-xml/XMLFileReader.cpp
  45. #, fuzzy, c-format
  46. msgid "Error: %s at line %lu"
  47. -msgstr "Памылка: %hs у радку %lu"
  48. +msgstr "Памылка: %s у радку %lu"
  49. #: libraries/lib-xml/XMLFileReader.cpp
  50. #, c-format
  51. @@ -4469,7 +4469,7 @@ msgstr "Больш не паказваць гэта папярэджанне"
  52. #: src/FileFormats.cpp
  53. #, c-format
  54. msgid "Error (file may not have been written): %s"
  55. -msgstr "Памылка (магчыма, файл не запісаны): %hs"
  56. +msgstr "Памылка (магчыма, файл не запісаны): %s"
  57. #: src/FileFormats.cpp
  58. #, fuzzy
  59. @@ -20925,7 +20925,7 @@ msgstr ""
  60. #: plug-ins/eq-xml-to-txt-converter.ny
  61. #, fuzzy, lisp-format
  62. msgid "Error.~%File cannot be written:~%\"~a.txt\""
  63. -msgstr "Памылка (магчыма, файл не запісаны): %hs"
  64. +msgstr "Памылка (магчыма, файл не запісаны): %s"
  65. #: plug-ins/equalabel.ny
  66. msgid "Regular Interval Labels"
  67. diff --git a/locale/bg.po b/locale/bg.po
  68. index e3d22e24da5b..119d386c0043 100644
  69. --- a/locale/bg.po
  70. +++ b/locale/bg.po
  71. @@ -2328,7 +2328,7 @@ msgstr "Не бе възможно да се отвори файл: „%s“"
  72. #: libraries/lib-xml/XMLFileReader.cpp
  73. #, fuzzy, c-format
  74. msgid "Error: %s at line %lu"
  75. -msgstr "Грешка: %hs на ред %lu"
  76. +msgstr "Грешка: %s на ред %lu"
  77. #: libraries/lib-xml/XMLFileReader.cpp
  78. #, c-format
  79. diff --git a/locale/ca.po b/locale/ca.po
  80. index aefd1e0e4523..36448c453735 100644
  81. --- a/locale/ca.po
  82. +++ b/locale/ca.po
  83. @@ -2299,7 +2299,7 @@ msgstr "No s'ha pogut obrir el fitxer: «%s»"
  84. #: libraries/lib-xml/XMLFileReader.cpp
  85. #, fuzzy, c-format
  86. msgid "Error: %s at line %lu"
  87. -msgstr "Error: %hs a la línia %lu"
  88. +msgstr "Error: %s a la línia %lu"
  89. #: libraries/lib-xml/XMLFileReader.cpp
  90. #, c-format
  91. diff --git a/locale/ca_ES@valencia.po b/locale/ca_ES@valencia.po
  92. index a498281e7780..5545ae76eefc 100644
  93. --- a/locale/ca_ES@valencia.po
  94. +++ b/locale/ca_ES@valencia.po
  95. @@ -2319,7 +2319,7 @@ msgstr "No s'ha pogut obrir el fitxer: «%s»"
  96. #: libraries/lib-xml/XMLFileReader.cpp
  97. #, fuzzy, c-format
  98. msgid "Error: %s at line %lu"
  99. -msgstr "Error: %hs en la línia %lu"
  100. +msgstr "Error: %s en la línia %lu"
  101. #: libraries/lib-xml/XMLFileReader.cpp
  102. #, c-format
  103. diff --git a/locale/fa.po b/locale/fa.po
  104. index 0374b06ce9a8..ba9831778428 100644
  105. --- a/locale/fa.po
  106. +++ b/locale/fa.po
  107. @@ -4413,7 +4413,7 @@ msgstr ""
  108. #: src/FileFormats.cpp
  109. #, c-format
  110. msgid "Error (file may not have been written): %s"
  111. -msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %hs"
  112. +msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %s"
  113. #: src/FileFormats.cpp
  114. msgid "&Copy uncompressed files into the project (safer)"
  115. @@ -20567,7 +20567,7 @@ msgstr ""
  116. #: plug-ins/eq-xml-to-txt-converter.ny
  117. #, fuzzy, lisp-format
  118. msgid "Error.~%File cannot be written:~%\"~a.txt\""
  119. -msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %hs"
  120. +msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %s"
  121. #: plug-ins/equalabel.ny
  122. msgid "Regular Interval Labels"
  123. diff --git a/locale/gl.po b/locale/gl.po
  124. index d2869ae5e41e..c30b70b93da0 100644
  125. --- a/locale/gl.po
  126. +++ b/locale/gl.po
  127. @@ -2325,7 +2325,7 @@ msgstr "Non foi posíbel abrir o ficheiro: «%s»"
  128. #: libraries/lib-xml/XMLFileReader.cpp
  129. #, fuzzy, c-format
  130. msgid "Error: %s at line %lu"
  131. -msgstr "Erro: %hs na liña %lu"
  132. +msgstr "Erro: %s na liña %lu"
  133. #: libraries/lib-xml/XMLFileReader.cpp
  134. #, c-format
  135. diff --git a/locale/hr.po b/locale/hr.po
  136. index 21259b91c281..7fe86224c2c2 100644
  137. --- a/locale/hr.po
  138. +++ b/locale/hr.po
  139. @@ -2333,7 +2333,7 @@ msgstr "Pogrješka pri otvaranju datoteke: \"%s\""
  140. #: libraries/lib-xml/XMLFileReader.cpp
  141. #, fuzzy, c-format
  142. msgid "Error: %s at line %lu"
  143. -msgstr "Pogrješka: %hs u retku %lu"
  144. +msgstr "Pogrješka: %s u retku %lu"
  145. #: libraries/lib-xml/XMLFileReader.cpp
  146. #, c-format
  147. diff --git a/locale/hy.po b/locale/hy.po
  148. index 4486bb403422..5e7f695565d2 100644
  149. --- a/locale/hy.po
  150. +++ b/locale/hy.po
  151. @@ -2323,7 +2323,7 @@ msgstr "Չի ստացվում բացել ֆայլը՝ \"%s\""
  152. #: libraries/lib-xml/XMLFileReader.cpp
  153. #, fuzzy, c-format
  154. msgid "Error: %s at line %lu"
  155. -msgstr "Սխալ՝ %hs %lu գծում"
  156. +msgstr "Սխալ՝ %s %lu գծում"
  157. #: libraries/lib-xml/XMLFileReader.cpp
  158. #, c-format
  159. diff --git a/locale/id.po b/locale/id.po
  160. index bf8b8b2d5bce..d7ed1b5c497e 100644
  161. --- a/locale/id.po
  162. +++ b/locale/id.po
  163. @@ -2326,7 +2326,7 @@ msgstr "Tidak bisa membuka file:\"%s\""
  164. #: libraries/lib-xml/XMLFileReader.cpp
  165. #, fuzzy, c-format
  166. msgid "Error: %s at line %lu"
  167. -msgstr "Error: %hs pada garis %lu"
  168. +msgstr "Error: %s pada garis %lu"
  169. #: libraries/lib-xml/XMLFileReader.cpp
  170. #, c-format
  171. diff --git a/locale/km.po b/locale/km.po
  172. index 2617d8673980..9f1b5ef629ea 100644
  173. --- a/locale/km.po
  174. +++ b/locale/km.po
  175. @@ -4432,7 +4432,7 @@ msgstr ""
  176. #: src/FileFormats.cpp
  177. #, fuzzy, c-format
  178. msgid "Error (file may not have been written): %s"
  179. -msgstr "កំហុស (ឯកសារ​អាច​មិន​ទាន់​ត្រូវ​បាន​សរសេរ) ៖ %hs"
  180. +msgstr "កំហុស (ឯកសារ​អាច​មិន​ទាន់​ត្រូវ​បាន​សរសេរ) ៖ %s"
  181. #: src/FileFormats.cpp
  182. msgid "&Copy uncompressed files into the project (safer)"
  183. @@ -20656,7 +20656,7 @@ msgstr ""
  184. #: plug-ins/eq-xml-to-txt-converter.ny
  185. #, fuzzy, lisp-format
  186. msgid "Error.~%File cannot be written:~%\"~a.txt\""
  187. -msgstr "កំហុស (ឯកសារ​អាច​មិន​ទាន់​ត្រូវ​បាន​សរសេរ) ៖ %hs"
  188. +msgstr "កំហុស (ឯកសារ​អាច​មិន​ទាន់​ត្រូវ​បាន​សរសេរ) ៖ %s"
  189. #: plug-ins/equalabel.ny
  190. msgid "Regular Interval Labels"
  191. diff --git a/locale/ro.po b/locale/ro.po
  192. index 4a1ef8b497d9..4207cd9c8095 100644
  193. --- a/locale/ro.po
  194. +++ b/locale/ro.po
  195. @@ -2255,7 +2255,7 @@ msgstr "Nu s-a putut deschide fișierul: „%s”"
  196. #: libraries/lib-xml/XMLFileReader.cpp
  197. #, fuzzy, c-format
  198. msgid "Error: %s at line %lu"
  199. -msgstr "Eroare: %hs la linia %lu"
  200. +msgstr "Eroare: %s la linia %lu"
  201. #: libraries/lib-xml/XMLFileReader.cpp
  202. #, c-format
  203. diff --git a/locale/sr_RS@latin.po b/locale/sr_RS@latin.po
  204. index 2c8adc0cec38..68d2f41fd09b 100644
  205. --- a/locale/sr_RS@latin.po
  206. +++ b/locale/sr_RS@latin.po
  207. @@ -2330,7 +2330,7 @@ msgstr "Ne mogu da otvorim datoteku: „%s“"
  208. #: libraries/lib-xml/XMLFileReader.cpp
  209. #, fuzzy, c-format
  210. msgid "Error: %s at line %lu"
  211. -msgstr "Greška: %hs u redu %lu"
  212. +msgstr "Greška: %s u redu %lu"
  213. #: libraries/lib-xml/XMLFileReader.cpp
  214. #, c-format
  215. diff --git a/locale/ta.po b/locale/ta.po
  216. index 52fc75eb9dbe..edf03a5290d7 100644
  217. --- a/locale/ta.po
  218. +++ b/locale/ta.po
  219. @@ -2308,7 +2308,7 @@ msgstr "கோப்பை திறக்க முடியவில்லை:
  220. #: libraries/lib-xml/XMLFileReader.cpp
  221. #, fuzzy, c-format
  222. msgid "Error: %s at line %lu"
  223. -msgstr "பிழை: %hs வரிசை %lu"
  224. +msgstr "பிழை: %s வரிசை %lu"
  225. #: libraries/lib-xml/XMLFileReader.cpp
  226. #, c-format
  227. diff --git a/locale/tg.po b/locale/tg.po
  228. index a88ff86bca57..ce5d5a8b2c2c 100644
  229. --- a/locale/tg.po
  230. +++ b/locale/tg.po
  231. @@ -4422,7 +4422,7 @@ msgstr ""
  232. #: src/FileFormats.cpp
  233. #, fuzzy, c-format
  234. msgid "Error (file may not have been written): %s"
  235. -msgstr "Хато (файл сабт намешавад): %hs"
  236. +msgstr "Хато (файл сабт намешавад): %s"
  237. #: src/FileFormats.cpp
  238. msgid "&Copy uncompressed files into the project (safer)"
  239. @@ -20628,7 +20628,7 @@ msgstr ""
  240. #: plug-ins/eq-xml-to-txt-converter.ny
  241. #, fuzzy, lisp-format
  242. msgid "Error.~%File cannot be written:~%\"~a.txt\""
  243. -msgstr "Хато (файл сабт намешавад): %hs"
  244. +msgstr "Хато (файл сабт намешавад): %s"
  245. #: plug-ins/equalabel.ny
  246. msgid "Regular Interval Labels"