[PATCH 0/1] MR1813: joy: Correct spelling of "overridden".

List overview All Threads

newer

older

[PATCH v2 0/2] MR1810:...

[PATCH 0/1] MR1815: bcrypt: Add...

Alex Henrie (＠alexhenrie)

14 Dec 2022 14 Dec '22

5 a.m.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1813

Show replies by date

Alex Henrie

14 Dec 14 Dec

5 a.m.

New subject: [PATCH 1/1] joy: Correct spelling of "overridden".

From: Alex Henrie alexhenrie24@gmail.com

diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc index d74afc38f58..08f6fa12e0c 100644 --- a/dlls/joy.cpl/joy.rc +++ b/dlls/joy.cpl/joy.rc @@ -75,19 +75,19 @@ FONT 8, "Ms Shell Dlg" GROUPBOX "User #3", IDC_XI_USER_3, 15, 220, 291, 60

LTEXT "No user detected on slot #0, make sure your " \ - "gamepad is plugged in, and not overriden for " \ + "gamepad is plugged in, and not overridden for " \ "DInput in the Joysticks tab.", IDC_XI_NO_USER_0, 15, 10, 291, 60 LTEXT "No user detected on slot #1, make sure your " \ - "gamepad is plugged in, and not overriden for " \ + "gamepad is plugged in, and not overridden for " \ "DInput in the Joysticks tab.", IDC_XI_NO_USER_1, 15, 80, 291, 60 LTEXT "No user detected on slot #2, make sure your " \ - "gamepad is plugged in, and not overriden for " \ + "gamepad is plugged in, and not overridden for " \ "DInput in the Joysticks tab.", IDC_XI_NO_USER_2, 15, 150, 291, 60 LTEXT "No user detected on slot #3, make sure your " \ - "gamepad is plugged in, and not overriden for " \ + "gamepad is plugged in, and not overridden for " \ "DInput in the Joysticks tab.", IDC_XI_NO_USER_3, 15, 220, 291, 60

diff --git a/po/ar.po b/po/ar.po index 614cd22c1e9..2888fed4538 100644 --- a/po/ar.po +++ b/po/ar.po @@ -3839,25 +3839,25 @@ msgstr "المستخدم" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/ast.po b/po/ast.po index 0401b330da1..8b505d8f5d9 100644 --- a/po/ast.po +++ b/po/ast.po @@ -3728,25 +3728,25 @@ msgstr "Usuarios" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/bg.po b/po/bg.po index 367f5f092fd..3bc0e391cdb 100644 --- a/po/bg.po +++ b/po/bg.po @@ -3847,25 +3847,25 @@ msgstr "Потребител" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/ca.po b/po/ca.po index f195b8a5c9e..ef5c7eb809b 100644 --- a/po/ca.po +++ b/po/ca.po @@ -3827,25 +3827,25 @@ msgstr "Usuari" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/cs.po b/po/cs.po index fd49f622275..a453ec50c6e 100644 --- a/po/cs.po +++ b/po/cs.po @@ -3788,25 +3788,25 @@ msgstr "Uživatel" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/da.po b/po/da.po index f0beed2404f..970f7df80c3 100644 --- a/po/da.po +++ b/po/da.po @@ -3870,25 +3870,25 @@ msgstr "Bruger" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/de.po b/po/de.po index 32c69e36553..3a3b03db896 100644 --- a/po/de.po +++ b/po/de.po @@ -3816,25 +3816,25 @@ msgstr "Benutzername" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/el.po b/po/el.po index 2dc704af229..3a5c6aba714 100644 --- a/po/el.po +++ b/po/el.po @@ -3751,25 +3751,25 @@ msgstr "" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/en.po b/po/en.po index 787d2cb4755..1664c52597b 100644 --- a/po/en.po +++ b/po/en.po @@ -3798,34 +3798,34 @@ msgstr "User #3" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab."

#: dlls/joy.cpl/joy.rc:82 msgid "" "No user detected on slot #1, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr "" "No user detected on slot #1, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab."

#: dlls/joy.cpl/joy.rc:86 msgid "" "No user detected on slot #2, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr "" "No user detected on slot #2, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab."

#: dlls/joy.cpl/joy.rc:90 msgid "" "No user detected on slot #3, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr "" "No user detected on slot #3, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab."

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 #: dlls/joy.cpl/joy.rc:98 diff --git a/po/en_US.po b/po/en_US.po index 038b084f629..c04161fe970 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -3798,34 +3798,34 @@ msgstr "User #3" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab."

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 #: dlls/joy.cpl/joy.rc:98 diff --git a/po/eo.po b/po/eo.po index 2bfcc1a531c..8776dd68b21 100644 --- a/po/eo.po +++ b/po/eo.po @@ -3754,25 +3754,25 @@ msgstr "Uzanto" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/es.po b/po/es.po index e4cd4603865..fe577dd60e3 100644 --- a/po/es.po +++ b/po/es.po @@ -3828,25 +3828,25 @@ msgstr "Usuario" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/fa.po b/po/fa.po index 8e13d8e1896..5388bf13738 100644 --- a/po/fa.po +++ b/po/fa.po @@ -3780,25 +3780,25 @@ msgstr "" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/fi.po b/po/fi.po index 089e9f45b86..793989e014a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3802,25 +3802,25 @@ msgstr "Käyttäjä" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/fr.po b/po/fr.po index 7267bf87a26..6167f0c1d04 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3834,25 +3834,25 @@ msgstr "Utilisateur" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/he.po b/po/he.po index 08582398e90..fc504572108 100644 --- a/po/he.po +++ b/po/he.po @@ -3831,25 +3831,25 @@ msgstr "משתמש" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/hi.po b/po/hi.po index 1c15a1ab9cf..03919a4a1ca 100644 --- a/po/hi.po +++ b/po/hi.po @@ -3712,25 +3712,25 @@ msgstr "" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/hr.po b/po/hr.po index 6fffff3f7d3..f9e965d2a08 100644 --- a/po/hr.po +++ b/po/hr.po @@ -3844,25 +3844,25 @@ msgstr "Korisničko ime" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/hu.po b/po/hu.po index 30d5a0d9308..aefd8906dfd 100644 --- a/po/hu.po +++ b/po/hu.po @@ -3886,25 +3886,25 @@ msgstr "Felhasználónév" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/it.po b/po/it.po index 54eff3e7874..7c7e9c26e6a 100644 --- a/po/it.po +++ b/po/it.po @@ -3894,25 +3894,25 @@ msgstr "Utente" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/ja.po b/po/ja.po index 22015e7e6ce..a232d5424a1 100644 --- a/po/ja.po +++ b/po/ja.po @@ -3802,25 +3802,25 @@ msgstr "ユーザー名" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/ko.po b/po/ko.po index 9b652c81a26..ff4d3f5e5dc 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3792,25 +3792,25 @@ msgstr "사용자" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/lt.po b/po/lt.po index d1064ad7dd4..4ef96a92e99 100644 --- a/po/lt.po +++ b/po/lt.po @@ -3801,7 +3801,7 @@ msgstr "Naudotojas #3" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr "" "Nerastas naudotojas lizde #0, įsitikinkite, kad žaidimų pultas prijungtas ir " "nenustelbtas dėl DInput Vairasvirčių kortelėje." @@ -3809,7 +3809,7 @@ msgstr "" #: dlls/joy.cpl/joy.rc:82 msgid "" "No user detected on slot #1, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr "" "Nerastas naudotojas lizde #1, įsitikinkite, kad žaidimų pultas prijungtas ir " "nenustelbtas dėl DInput Vairasvirčių kortelėje." @@ -3817,7 +3817,7 @@ msgstr "" #: dlls/joy.cpl/joy.rc:86 msgid "" "No user detected on slot #2, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr "" "Nerastas naudotojas lizde #2, įsitikinkite, kad žaidimų pultas prijungtas ir " "nenustelbtas dėl DInput Vairasvirčių kortelėje." @@ -3825,7 +3825,7 @@ msgstr "" #: dlls/joy.cpl/joy.rc:90 msgid "" "No user detected on slot #3, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr "" "Nerastas naudotojas lizde #3, įsitikinkite, kad žaidimų pultas prijungtas ir " "nenustelbtas dėl DInput Vairasvirčių kortelėje." diff --git a/po/ml.po b/po/ml.po index 7017fb9fbe1..3b431aec552 100644 --- a/po/ml.po +++ b/po/ml.po @@ -3714,25 +3714,25 @@ msgstr "" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/nb_NO.po b/po/nb_NO.po index a788f445708..01b12008f5c 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -3822,25 +3822,25 @@ msgstr "Bruker" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/nl.po b/po/nl.po index 84c96ffae99..59c6aceca10 100644 --- a/po/nl.po +++ b/po/nl.po @@ -3812,7 +3812,7 @@ msgstr "Gebruiker 3" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr "" "Geen gebruiker gevonden op slot nr. 0. Zorg dat de gamepad is aangesloten en " "niet voor DInput is overschreven op het Joysticks-tabblad." @@ -3820,7 +3820,7 @@ msgstr "" #: dlls/joy.cpl/joy.rc:82 msgid "" "No user detected on slot #1, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr "" "Geen gebruiker gevonden op slot nr. 1. Zorg dat de gamepad is aangesloten en " "niet voor DInput is overschreven op het Joysticks-tabblad." @@ -3828,7 +3828,7 @@ msgstr "" #: dlls/joy.cpl/joy.rc:86 msgid "" "No user detected on slot #2, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr "" "Geen gebruiker gevonden op slot nr. 2. Zorg dat de gamepad is aangesloten en " "niet voor DInput is overschreven op het Joysticks-tabblad." @@ -3836,7 +3836,7 @@ msgstr "" #: dlls/joy.cpl/joy.rc:90 msgid "" "No user detected on slot #3, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr "" "Geen gebruiker gevonden op slot nr. 3. Zorg dat de gamepad is aangesloten en " "niet voor DInput is overschreven op het Joysticks-tabblad." diff --git a/po/or.po b/po/or.po index f32c468e0db..0082689f58d 100644 --- a/po/or.po +++ b/po/or.po @@ -3712,25 +3712,25 @@ msgstr "" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/pa.po b/po/pa.po index 2a2af6b7733..4c3f431b746 100644 --- a/po/pa.po +++ b/po/pa.po @@ -3712,25 +3712,25 @@ msgstr "" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/pl.po b/po/pl.po index d3298bee196..583db3af500 100644 --- a/po/pl.po +++ b/po/pl.po @@ -3827,25 +3827,25 @@ msgstr "Użytkownik" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/pt_BR.po b/po/pt_BR.po index 001e087dcfd..2cfd2549ed6 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -3823,25 +3823,25 @@ msgstr "Usuário" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/pt_PT.po b/po/pt_PT.po index bad3e2bb12e..3eb5aaeea63 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -3870,25 +3870,25 @@ msgstr "Utilizador" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/rm.po b/po/rm.po index 7e13f415606..33ee55775af 100644 --- a/po/rm.po +++ b/po/rm.po @@ -3741,25 +3741,25 @@ msgstr "" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/ro.po b/po/ro.po index 823d1d58854..68592b86328 100644 --- a/po/ro.po +++ b/po/ro.po @@ -3821,25 +3821,25 @@ msgstr "Utilizator" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/ru.po b/po/ru.po index febbef30ebf..d30632b6cef 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3830,25 +3830,25 @@ msgstr "Имя" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/si.po b/po/si.po index 419ccaa275d..4e2270c3320 100644 --- a/po/si.po +++ b/po/si.po @@ -3753,25 +3753,25 @@ msgstr "පරිශීලකය" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/sk.po b/po/sk.po index 3d0b94ba4ce..c2387d413c6 100644 --- a/po/sk.po +++ b/po/sk.po @@ -3792,25 +3792,25 @@ msgstr "" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/sl.po b/po/sl.po index 39b17ec6939..2708682753e 100644 --- a/po/sl.po +++ b/po/sl.po @@ -3888,25 +3888,25 @@ msgstr "Uporabniško ime" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po index a40c5f88319..34cd34c3246 100644 --- a/po/sr_RS@cyrillic.po +++ b/po/sr_RS@cyrillic.po @@ -3864,25 +3864,25 @@ msgstr "Корисничко име" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po index 8baa3e6f456..ed7e9811776 100644 --- a/po/sr_RS@latin.po +++ b/po/sr_RS@latin.po @@ -3949,25 +3949,25 @@ msgstr "Korisničko ime" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/sv.po b/po/sv.po index 208ecc0d4d7..5e52599bef0 100644 --- a/po/sv.po +++ b/po/sv.po @@ -3849,25 +3849,25 @@ msgstr "Användare" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/ta.po b/po/ta.po index f1af94e9125..368a3a2a2d4 100644 --- a/po/ta.po +++ b/po/ta.po @@ -3678,25 +3678,25 @@ msgstr "" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/te.po b/po/te.po index fcba1b1df3b..25980d922a7 100644 --- a/po/te.po +++ b/po/te.po @@ -3712,25 +3712,25 @@ msgstr "" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/th.po b/po/th.po index 32934ef7b36..b8a67e4c1a1 100644 --- a/po/th.po +++ b/po/th.po @@ -3770,25 +3770,25 @@ msgstr "" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/tr.po b/po/tr.po index cda57afd85c..4b8b1c096fd 100644 --- a/po/tr.po +++ b/po/tr.po @@ -3823,25 +3823,25 @@ msgstr "Kullanıcı" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/uk.po b/po/uk.po index 738cb9405f7..fdce4739263 100644 --- a/po/uk.po +++ b/po/uk.po @@ -3814,25 +3814,25 @@ msgstr "Користувач" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/wa.po b/po/wa.po index f2fa6358108..cd0417b2569 100644 --- a/po/wa.po +++ b/po/wa.po @@ -3776,25 +3776,25 @@ msgstr "" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/wine.pot b/po/wine.pot index b11262e67fd..266b26e4acb 100644 --- a/po/wine.pot +++ b/po/wine.pot @@ -3667,25 +3667,25 @@ msgstr "" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/zh_CN.po b/po/zh_CN.po index 38ad1dfefec..012cce496b1 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3758,25 +3758,25 @@ msgstr "用户名" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97 diff --git a/po/zh_TW.po b/po/zh_TW.po index 912f23cf95b..1def9b22a99 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -3762,25 +3762,25 @@ msgstr "使用者" #: dlls/joy.cpl/joy.rc:78 msgid "" "No user detected on slot #0, make sure your gamepad is plugged in, and not " -"overriden for DInput in the Joysticks tab." +"overridden for DInput in the Joysticks tab." msgstr ""

#: dlls/joy.cpl/joy.rc:95 dlls/joy.cpl/joy.rc:96 dlls/joy.cpl/joy.rc:97

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1813

Rémi Bernon (＠rbernon)

9:10 a.m.

New subject: [PATCH 0/1] MR1813: joy: Correct spelling of "overridden". - approved

This merge request was approved by Rémi Bernon.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1813

919

Age (days ago)

919

Last active (days ago)

wine-gitlab@winehq.org

2 comments

3 participants

tags (0)

participants (3)

Alex Henrie
Alex Henrie (＠alexhenrie)
Rémi Bernon (＠rbernon)