1From e6ccc8a8cf1391010a8220836a732da9fab19c69 Mon Sep 17 00:00:00 2001 2From: Khem Raj <raj.khem@gmail.com> 3Date: Thu, 7 Sep 2023 12:35:12 -0700 4Subject: [PATCH] Fix Translations containing invalid directives %hs 5 6Found with gettext 0.22 7Older versions of msgfmt were more sloppy, thus allowing such mistakes to cause bugs at runtime. 8 9https://bugs.gentoo.org/908868 10https://savannah.gnu.org/bugs/index.php?64333 11https://github.com/fontforge/fontforge/issues/5251 12 13Upstream-Status: Pending 14Signed-off-by: Khem Raj <raj.khem@gmail.com> 15--- 16 fontforgeexe/searchview.c | 2 +- 17 po/ca.po | 4 ++-- 18 po/de.po | 4 ++-- 19 po/en_GB.po | 4 ++-- 20 po/fr.po | 40 +++++++++++++++++++-------------------- 21 po/hr.po | 4 ++-- 22 po/it.po | 8 ++++---- 23 po/ja.po | 4 ++-- 24 po/ko.po | 4 ++-- 25 po/pl.po | 4 ++-- 26 po/uk.po | 4 ++-- 27 po/vi.po | 4 ++-- 28 12 files changed, 43 insertions(+), 43 deletions(-) 29 30diff --git a/fontforgeexe/searchview.c b/fontforgeexe/searchview.c 31index 1cb39a221..7e1c109cb 100644 32--- a/fontforgeexe/searchview.c 33+++ b/fontforgeexe/searchview.c 34@@ -516,7 +516,7 @@ return( true ); 35 if ( ask_if_difficult==2 && !searcher->isvisible ) 36 return( false ); 37 if ( gwwv_ask(_("Bad Reference"),(const char **) buttons,1,1, 38- _("The %1$s in the search dialog contains a reference to %2$.20hs which does not exist in the new font.\nShould I remove the reference?"), 39+ _("The %1$s in the search dialog contains a reference to %2$.20s which does not exist in the new font.\nShould I remove the reference?"), 40 i==0?_("Search Pattern"):_("Replace Pattern"), 41 r->sc->name)==1 ) 42 return( false ); 43diff --git a/po/ca.po b/po/ca.po 44index e2349b6ef..6c920b7c0 100644 45--- a/po/ca.po 46+++ b/po/ca.po 47@@ -12347,11 +12347,11 @@ msgstr "Tai" 48 49 #, c-format 50 msgid "" 51-"The %1$s in the search dialog contains a reference to %2$.20hs which does " 52+"The %1$s in the search dialog contains a reference to %2$.20s which does " 53 "not exist in the new font.\n" 54 "Should I remove the reference?" 55 msgstr "" 56-"Al diàleg de cerca, %1$s conté una referència a %2$.20hs\n" 57+"Al diàleg de cerca, %1$s conté una referència a %2$.20s\n" 58 "que no existeix en el nou tipus.\n" 59 "Voleu eliminar la referència?" 60 61diff --git a/po/de.po b/po/de.po 62index 41430ffae..8a31aeaa2 100644 63--- a/po/de.po 64+++ b/po/de.po 65@@ -15765,11 +15765,11 @@ msgstr "" 66 67 #, c-format 68 msgid "" 69-"The %1$s in the search dialog contains a reference to %2$.20hs which does " 70+"The %1$s in the search dialog contains a reference to %2$.20s which does " 71 "not exist in the new font.\n" 72 "Should I remove the reference?" 73 msgstr "" 74-"%1$s im Suchdialog enthält eine Referenz auf %2$.20hs, die in der neuen " 75+"%1$s im Suchdialog enthält eine Referenz auf %2$.20s, die in der neuen " 76 "Schrift nicht existiert.\n" 77 "Soll der Referenz entfernt werden?" 78 79diff --git a/po/en_GB.po b/po/en_GB.po 80index 9bd2d62bb..fce64c97d 100644 81--- a/po/en_GB.po 82+++ b/po/en_GB.po 83@@ -728,11 +728,11 @@ msgstr "Template Colour" 84 85 #, c-format 86 msgid "" 87-"The %1$s in the search dialog contains a reference to %2$.20hs which does " 88+"The %1$s in the search dialog contains a reference to %2$.20s which does " 89 "not exist in the new font.\n" 90 "Should I remove the reference?" 91 msgstr "" 92-"The %1$s in the search dialogue contains a reference to %2$.20hs which does " 93+"The %1$s in the search dialogue contains a reference to %2$.20s which does " 94 "not exist in the new font.\n" 95 "Should I remove the reference?" 96 97diff --git a/po/fr.po b/po/fr.po 98index 26e446b38..d130f89bc 100644 99--- a/po/fr.po 100+++ b/po/fr.po 101@@ -291,7 +291,7 @@ msgstr "chaîne %1$.30s pour %2$.30s" 102 #. GT: $4 is the changed flag ('*' for the changed items) 103 #, c-format 104 msgid "%1$.80s at %2$d from %3$.90s%4$s" 105-msgstr "%1$.80s à %2$d de %3$.90hs%4$s" 106+msgstr "%1$.80s à %2$d de %3$.90s%4$s" 107 108 #. GT: This is the title for a window showing a bitmap character 109 #. GT: It will look something like: 110@@ -302,7 +302,7 @@ msgstr "%1$.80s à %2$d de %3$.90hs%4$s" 111 #. GT: $4 is the font name 112 #, c-format 113 msgid "%1$.80s at %2$d size %3$d from %4$.80s" 114-msgstr "%1$.80s (%2$d) taille %3$d de %4$.80hs" 115+msgstr "%1$.80s (%2$d) taille %3$d de %4$.80s" 116 117 #, c-format 118 msgid "%1$s from lookup subtable %2$.50s" 119@@ -7433,7 +7433,7 @@ msgid "" 120 "Reverting the file will lose those changes.\n" 121 "Is that what you want?" 122 msgstr "" 123-"La fonte %1$.40s dans le fichier %2$.40hs a été modifiée.\n" 124+"La fonte %1$.40s dans le fichier %2$.40s a été modifiée.\n" 125 "Revenir vous fera perdre toutes les modifications.\n" 126 "Voulez vous vraiment revenir ?" 127 128@@ -19077,11 +19077,11 @@ msgstr "" 129 130 #, c-format 131 msgid "" 132-"The %1$s in the search dialog contains a reference to %2$.20hs which does " 133+"The %1$s in the search dialog contains a reference to %2$.20s which does " 134 "not exist in the new font.\n" 135 "Should I remove the reference?" 136 msgstr "" 137-"Dans %1$s du dialogue de recherche il y a une référence vers %2$.20hs qui " 138+"Dans %1$s du dialogue de recherche il y a une référence vers %2$.20s qui " 139 "n'existe pas dans la nouvelle fonte.\n" 140 "Faut-il supprimer la référence ?" 141 142@@ -19925,7 +19925,7 @@ msgid "" 143 "The fonts %1$.30s and %2$.30s have a different number of glyphs or different " 144 "encodings" 145 msgstr "" 146-"Les fontes %1$.30s et %2$.30hs n'ont pas le même nombre de glyphes ou des " 147+"Les fontes %1$.30s et %2$.30s n'ont pas le même nombre de glyphes ou des " 148 "codages différents" 149 150 #, c-format 151@@ -19933,7 +19933,7 @@ msgid "" 152 "The fonts %1$.30s and %2$.30s use different types of splines (one quadratic, " 153 "one cubic)" 154 msgstr "" 155-"Les fontes %1$.30s et %2$.30hs utilisent des courbes de Bézier d'ordres " 156+"Les fontes %1$.30s et %2$.30s utilisent des courbes de Bézier d'ordres " 157 "différents (quadratique et cubique)" 158 159 msgid "The generated font won't work with ATM" 160@@ -19968,8 +19968,8 @@ msgid "" 161 "The glyph %1$.30s in font %2$.30s has a different hint mask on its contours " 162 "than in %3$.30s" 163 msgstr "" 164-"Le glyphe %1$.30s dans la police %2$.30hs a un masque de hints différent que " 165-"dans %3$.30hs" 166+"Le glyphe %1$.30s dans la police %2$.30s a un masque de hints différent que " 167+"dans %3$.30s" 168 169 #, c-format 170 msgid "" 171@@ -19984,8 +19984,8 @@ msgid "" 172 "The glyph %1$.30s in font %2$.30s has a different number of references than " 173 "in %3$.30s" 174 msgstr "" 175-"Le glyphe %1$.30s de la fonte %2$.30hs a un nombre de références différent " 176-"dans %3$.30hs" 177+"Le glyphe %1$.30s de la fonte %2$.30s a un nombre de références différent " 178+"dans %3$.30s" 179 180 #, c-format 181 msgid "" 182@@ -20457,7 +20457,7 @@ msgstr "" 183 #, c-format 184 msgid "The outlines of glyph %2$.30s were not found in the font %1$.60s" 185 msgstr "" 186-"Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60hs" 187+"Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60s" 188 189 msgid "The paths that make up this glyph intersect one another" 190 msgstr "Les chemins qui composent ce glyphe se coupent les uns les autres" 191@@ -21042,7 +21042,7 @@ msgstr "Il y a déjà une sous-table avec ce nom, changez de nom SVP" 192 193 #, c-format 194 msgid "There is already an anchor point named %1$.40s in %2$.40s." 195-msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40hs." 196+msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40s." 197 198 msgid "There is another glyph in the font with this name" 199 msgstr "Il y a un autre glyphe dans la fonte avec ce nom" 200@@ -21441,8 +21441,8 @@ msgid "" 201 "been able to find is %1$.20s-%2$.20s-%4$d.\n" 202 "Shall I use that or let you search?" 203 msgstr "" 204-"Cette fonte est basée sur le jeu de caractères %1$.20s-%2$.20hs-%3$d, mais " 205-"ce que j'ai trouvé de mieux c'est %1$.20hs-%2$.20hs-%4$d.\n" 206+"Cette fonte est basée sur le jeu de caractères %1$.20s-%2$.20s-%3$d, mais " 207+"ce que j'ai trouvé de mieux c'est %1$.20s-%2$.20s-%4$d.\n" 208 "Devrais-je utiliser cette valeur ou préférez vous chercher ?" 209 210 msgid "" 211@@ -21770,7 +21770,7 @@ msgid "" 212 "with a 0 offset for this combination. Would you like to alter this kerning " 213 "class entry (or create a kerning pair for just these two glyphs)?" 214 msgstr "" 215-"Cette paire de crénage (%.20s et %.20hs) est dans une classe de crénage\n" 216+"Cette paire de crénage (%.20s et %.20s) est dans une classe de crénage\n" 217 "avec un déplacement de 0 pour cette combinaison. Voulez-vous modifier cette " 218 "partie\n" 219 "de la classe de crénage (ou créer une nouvelle paire rien que pour ces 2 " 220@@ -24551,8 +24551,8 @@ msgid "" 221 "referred to.\n" 222 "It will not be copied." 223 msgstr "" 224-"Vous essayer de coller une référence vers %1$s dans %2$hs.\n" 225-"Mais %1$hs n'existe pas dans cette fonte, et FontForge ne trouve pas le " 226+"Vous essayer de coller une référence vers %1$s dans %2$s.\n" 227+"Mais %1$s n'existe pas dans cette fonte, et FontForge ne trouve pas le " 228 "glyphe auquel il se référait.\n" 229 "Le glyphe ne sera pas copié." 230 231@@ -24562,8 +24562,8 @@ msgid "" 232 "But %1$s does not exist in this font.\n" 233 "Would you like to copy the original splines (or delete the reference)?" 234 msgstr "" 235-"Vous essayer de coller une référence vers %1$s dans %2$hs.\n" 236-"Mais %1$hs n'existe pas dans cette fonte.\n" 237+"Vous essayer de coller une référence vers %1$s dans %2$s.\n" 238+"Mais %1$s n'existe pas dans cette fonte.\n" 239 "Voulez vous copier le contour d'origine (ou supprimer la référence)?" 240 241 msgid "" 242diff --git a/po/hr.po b/po/hr.po 243index d261d4ca7..ac41b9250 100644 244--- a/po/hr.po 245+++ b/po/hr.po 246@@ -20156,11 +20156,11 @@ msgstr "" 247 248 #, c-format 249 msgid "" 250-"The %1$s in the search dialog contains a reference to %2$.20hs which does " 251+"The %1$s in the search dialog contains a reference to %2$.20s which does " 252 "not exist in the new font.\n" 253 "Should I remove the reference?" 254 msgstr "" 255-"%1$s u dijaloškom okviru traženja sadrži referencu na %2$.20hs koja ne " 256+"%1$s u dijaloškom okviru traženja sadrži referencu na %2$.20s koja ne " 257 "postoji u fontu.\n" 258 "Želiš li dozvoliti uklanjanje reference?" 259 260diff --git a/po/it.po b/po/it.po 261index e13711485..d0c3ea987 100644 262--- a/po/it.po 263+++ b/po/it.po 264@@ -2303,7 +2303,7 @@ msgid "" 265 "Reverting the file will lose those changes.\n" 266 "Is that what you want?" 267 msgstr "" 268-"Il font %1$.40s nel file %2$.40hs è stato modificato.\n" 269+"Il font %1$.40s nel file %2$.40s è stato modificato.\n" 270 "Ripristinando il file perderai tutte le modifiche.\n" 271 "È quello che vuoi fare?" 272 273@@ -5835,7 +5835,7 @@ msgid "" 274 "The glyph %1$.30s has a different number of contours in font %2$.30s than in " 275 "%3$.30s" 276 msgstr "" 277-"Il glifo %1$.30s ha un diverso numero di contorni nel font %2$.30hs rispetto " 278+"Il glifo %1$.30s ha un diverso numero di contorni nel font %2$.30s rispetto " 279 "a %3$.30s" 280 281 #, c-format 282@@ -6235,8 +6235,8 @@ msgid "" 283 "been able to find is %1$.20s-%2$.20s-%4$d.\n" 284 "Shall I use that or let you search?" 285 msgstr "" 286-"Questo font è basato sulla codifica di caratteri %1$.20s-%2$.20hs-%3$d, ma " 287-"il migliore che io abbia trovato è %1$.20hs-%2$.20hs-%4$d.\n" 288+"Questo font è basato sulla codifica di caratteri %1$.20s-%2$.20s-%3$d, ma " 289+"il migliore che io abbia trovato è %1$.20s-%2$.20s-%4$d.\n" 290 "Devo usare questo valore o preferisci cercare tu stesso?" 291 292 msgid "" 293diff --git a/po/ja.po b/po/ja.po 294index ed9f5a645..206ae82d1 100644 295--- a/po/ja.po 296+++ b/po/ja.po 297@@ -11458,11 +11458,11 @@ msgstr "" 298 299 #, c-format 300 msgid "" 301-"The %1$s in the search dialog contains a reference to %2$.20hs which does " 302+"The %1$s in the search dialog contains a reference to %2$.20s which does " 303 "not exist in the new font.\n" 304 "Should I remove the reference?" 305 msgstr "" 306-"%1$s には, 新しいフォントには含まれないグリフ %2$.20hs への参照が含まれていま" 307+"%1$s には, 新しいフォントには含まれないグリフ %2$.20s への参照が含まれていま" 308 "す.\n" 309 "参照を削除しますか?" 310 311diff --git a/po/ko.po b/po/ko.po 312index 971b4db03..4d5c8d40d 100644 313--- a/po/ko.po 314+++ b/po/ko.po 315@@ -20920,11 +20920,11 @@ msgstr "" 316 317 #, c-format 318 msgid "" 319-"The %1$s in the search dialog contains a reference to %2$.20hs which does " 320+"The %1$s in the search dialog contains a reference to %2$.20s which does " 321 "not exist in the new font.\n" 322 "Should I remove the reference?" 323 msgstr "" 324-"검색 대화 상자의 %1$s에는 새 글꼴에 없는 %2$.20hs에 대한 참조가 포함되어 있" 325+"검색 대화 상자의 %1$s에는 새 글꼴에 없는 %2$.20s에 대한 참조가 포함되어 있" 326 "다.\n" 327 "참조를 제거해야 하는가?" 328 329diff --git a/po/pl.po b/po/pl.po 330index 2bbbf00be..c1fd5a454 100644 331--- a/po/pl.po 332+++ b/po/pl.po 333@@ -19552,11 +19552,11 @@ msgstr "" 334 335 #, c-format 336 msgid "" 337-"The %1$s in the search dialog contains a reference to %2$.20hs which does " 338+"The %1$s in the search dialog contains a reference to %2$.20s which does " 339 "not exist in the new font.\n" 340 "Should I remove the reference?" 341 msgstr "" 342-"%1$s w okienku wyszukiwania zawiera odwołanie do %2$.20hs, który nie " 343+"%1$s w okienku wyszukiwania zawiera odwołanie do %2$.20s, który nie " 344 "istnieje w nowym foncie.\n" 345 "Czy usunąć to odwołanie?" 346 347diff --git a/po/uk.po b/po/uk.po 348index e3768acc3..3302a1005 100644 349--- a/po/uk.po 350+++ b/po/uk.po 351@@ -19860,11 +19860,11 @@ msgstr "" 352 353 #, c-format 354 msgid "" 355-"The %1$s in the search dialog contains a reference to %2$.20hs which does " 356+"The %1$s in the search dialog contains a reference to %2$.20s which does " 357 "not exist in the new font.\n" 358 "Should I remove the reference?" 359 msgstr "" 360-"%1$s у діалоговому вікні пошуку містить посилання на %2$.20hs, якого не " 361+"%1$s у діалоговому вікні пошуку містить посилання на %2$.20s, якого не " 362 "існує у новому шрифті.\n" 363 "Вилучити це посилання?" 364 365diff --git a/po/vi.po b/po/vi.po 366index 6aee8bb3f..f5eb739e6 100644 367--- a/po/vi.po 368+++ b/po/vi.po 369@@ -17109,11 +17109,11 @@ msgstr "" 370 371 #, c-format 372 msgid "" 373-"The %1$s in the search dialog contains a reference to %2$.20hs which does " 374+"The %1$s in the search dialog contains a reference to %2$.20s which does " 375 "not exist in the new font.\n" 376 "Should I remove the reference?" 377 msgstr "" 378-"Trong hộp thoại tìm kiếm, %1$s chứa một tham chiếu đến %2$.20hs mà không tồn " 379+"Trong hộp thoại tìm kiếm, %1$s chứa một tham chiếu đến %2$.20s mà không tồn " 380 "tại trong phông mới.\n" 381 "Bạn có muốn gỡ bỏ tham chiếu này không?" 382 383-- 3842.42.0 385 386