Skip to content

Commit 410b395

Browse files
Merge branch '4.4' into 5.0
* 4.4: [PhpUnitBridge] fix leftover [PhpUnitBridge] fix installing under PHP >= 8 Use ">=" for the "php" requirement bump icu 67.1
2 parents 9917d1e + 8a1a0f2 commit 410b395

File tree

323 files changed

+3381
-734
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

323 files changed

+3381
-734
lines changed

Resources/data/languages/af.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
"eu": "Baskies",
9292
"ewo": "Ewondo",
9393
"fa": "Persies",
94-
"fa_AF": "Dari",
9594
"ff": "Fulah",
9695
"fi": "Fins",
9796
"fil": "Filippyns",
@@ -397,6 +396,7 @@
397396
"ar_001": "Moderne Standaardarabies",
398397
"en_GB": "Engels (VK)",
399398
"en_US": "Engels (VSA)",
399+
"fa_AF": "Dari",
400400
"nds_NL": "Nedersaksies",
401401
"nl_BE": "Vlaams"
402402
}

Resources/data/languages/am.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@
133133
"eu": "ባስክኛ",
134134
"ewo": "ኤዎንዶ",
135135
"fa": "ፐርሺያኛ",
136-
"fa_AF": "ዳሪኛ",
137136
"ff": "ፉላህ",
138137
"fi": "ፊኒሽ",
139138
"fil": "ፊሊፒንኛ",
@@ -455,6 +454,7 @@
455454
"es_419": "የላቲን አሜሪካ ስፓኒሽ",
456455
"es_ES": "የአውሮፓ ስፓንሽኛ",
457456
"es_MX": "የሜክሲኮ ስፓንሽኛ",
457+
"fa_AF": "ዳሪኛ",
458458
"fr_CA": "የካናዳ ፈረንሳይኛ",
459459
"fr_CH": "የስዊዝ ፈረንሳይኛ",
460460
"nds_NL": "የታችኛው ሳክሰን",

Resources/data/languages/ar.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@
128128
"eu": "الباسكية",
129129
"ewo": "الإيوندو",
130130
"fa": "الفارسية",
131-
"fa_AF": "الدارية",
132131
"fan": "الفانج",
133132
"fat": "الفانتي",
134133
"ff": "الفولانية",
@@ -520,6 +519,7 @@
520519
"es_419": "الإسبانية أمريكا اللاتينية",
521520
"es_ES": "الإسبانية الأوروبية",
522521
"es_MX": "الإسبانية المكسيكية",
522+
"fa_AF": "الدارية",
523523
"fr_CA": "الفرنسية الكندية",
524524
"fr_CH": "الفرنسية السويسرية",
525525
"nds_NL": "السكسونية السفلى",

Resources/data/languages/as.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686
"eu": "বাস্ক",
8787
"ewo": "ইওন্দো",
8888
"fa": "ফাৰ্ছী",
89-
"fa_AF": "দাৰি",
9089
"ff": "ফুলাহ",
9190
"fi": "ফিনিচ",
9291
"fil": "ফিলিপিনো",
@@ -381,6 +380,7 @@
381380
"es_419": "লেটিন আমেৰিকান স্পেনিচ",
382381
"es_ES": "ইউৰোপীয়ান স্পেনিচ",
383382
"es_MX": "মেক্সিকান স্পেনিচ",
383+
"fa_AF": "দাৰি",
384384
"fr_CA": "কানাডিয়ান ফ্ৰেন্স",
385385
"fr_CH": "ছুইচ ফ্ৰেন্স",
386386
"nl_BE": "ফ্লেমিচ",

Resources/data/languages/az.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@
119119
"eu": "bask",
120120
"ewo": "evondo",
121121
"fa": "fars",
122-
"fa_AF": "dari",
123122
"fan": "fang",
124123
"fat": "fanti",
125124
"ff": "fula",
@@ -502,6 +501,7 @@
502501
"es_419": "Latın Amerikası ispancası",
503502
"es_ES": "Kastiliya ispancası",
504503
"es_MX": "Meksika ispancası",
504+
"fa_AF": "dari",
505505
"fr_CA": "Kanada fransızcası",
506506
"fr_CH": "İsveçrə fransızcası",
507507
"nds_NL": "aşağı sakson",

Resources/data/languages/be.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@
9494
"eu": "баскская",
9595
"ewo": "эвонда",
9696
"fa": "фарсі",
97-
"fa_AF": "дары",
9897
"ff": "фула",
9998
"fi": "фінская",
10099
"fil": "філіпінская",
@@ -409,6 +408,7 @@
409408
"es_419": "лацінаамерыканская іспанская",
410409
"es_ES": "еўрапейская іспанская",
411410
"es_MX": "мексіканская іспанская",
411+
"fa_AF": "дары",
412412
"fr_CA": "канадская французская",
413413
"fr_CH": "швейцарская французская",
414414
"nds_NL": "ніжнесаксонская",

Resources/data/languages/bg.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
"cad": "каддо",
6161
"car": "карибски",
6262
"cch": "атсам",
63+
"ccp": "чакма",
6364
"ce": "чеченски",
6465
"ceb": "себуански",
6566
"cgg": "чига",
@@ -491,10 +492,12 @@
491492
"ar_001": "съвременен стандартен арабски",
492493
"en_GB": "английски (Обединено кралство)",
493494
"en_US": "английски (САЩ)",
495+
"fa_AF": "дари",
494496
"nds_NL": "долносаксонски",
495497
"nl_BE": "фламандски",
496498
"ro_MD": "молдовски",
497499
"sw_CD": "конгоански суахили",
498-
"zh_Hans": "китайски (опростен)"
500+
"zh_Hans": "китайски (опростен)",
501+
"zh_Hant": "китайски (традиционен)"
499502
}
500503
}

Resources/data/languages/bn.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@
119119
"eu": "বাস্ক",
120120
"ewo": "ইওন্ডো",
121121
"fa": "ফার্সি",
122-
"fa_AF": "দারি",
123122
"fan": "ফ্যাঙ্গ",
124123
"fat": "ফান্তি",
125124
"ff": "ফুলাহ্",
@@ -505,6 +504,7 @@
505504
"es_419": "ল্যাটিন আমেরিকান স্প্যানিশ",
506505
"es_ES": "ইউরোপীয় স্প্যানিশ",
507506
"es_MX": "ম্যাক্সিকান স্প্যানিশ",
507+
"fa_AF": "দারি",
508508
"fr_CA": "কানাডীয় ফরাসি",
509509
"fr_CH": "সুইস ফরাসি",
510510
"nds_NL": "লো স্যাক্সন",

Resources/data/languages/bs.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@
9898
"dar": "dargva",
9999
"dav": "taita",
100100
"de": "njemački",
101-
"de_CH": "visoki njemački (Švicarska)",
102101
"del": "delaver",
103102
"den": "slave",
104103
"dgr": "dogrib",
@@ -128,7 +127,6 @@
128127
"eu": "baskijski",
129128
"ewo": "evondo",
130129
"fa": "perzijski",
131-
"fa_AF": "dari",
132130
"fan": "fang",
133131
"fat": "fanti",
134132
"ff": "fulah",
@@ -507,6 +505,8 @@
507505
},
508506
"LocalizedNames": {
509507
"ar_001": "moderni standardni arapski",
508+
"de_CH": "visoki njemački (Švicarska)",
509+
"fa_AF": "dari",
510510
"nds_NL": "donjosaksonski",
511511
"nl_BE": "flamanski",
512512
"ro_MD": "moldavski",

Resources/data/languages/ca.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@
138138
"ewo": "ewondo",
139139
"ext": "extremeny",
140140
"fa": "persa",
141-
"fa_AF": "dari",
142141
"fan": "fang",
143142
"fat": "fanti",
144143
"ff": "ful",
@@ -562,6 +561,7 @@
562561
"es_419": "espanyol hispanoamericà",
563562
"es_ES": "espanyol europeu",
564563
"es_MX": "espanyol de Mèxic",
564+
"fa_AF": "dari",
565565
"fr_CA": "francès canadenc",
566566
"fr_CH": "francès suís",
567567
"nds_NL": "baix saxó",

Resources/data/languages/cs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@
150150
"ewo": "ewondo",
151151
"ext": "extremadurština",
152152
"fa": "perština",
153-
"fa_AF": "darí",
154153
"fan": "fang",
155154
"fat": "fantština",
156155
"ff": "fulbština",
@@ -601,6 +600,7 @@
601600
"en_GB": "angličtina (Velká Británie)",
602601
"en_US": "angličtina (USA)",
603602
"es_ES": "španělština (Evropa)",
603+
"fa_AF": "darí",
604604
"nds_NL": "dolnosaština",
605605
"nl_BE": "vlámština",
606606
"pt_PT": "portugalština (Evropa)",

Resources/data/languages/cy.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@
125125
"ewo": "Ewondo",
126126
"ext": "Extremadureg",
127127
"fa": "Perseg",
128-
"fa_AF": "Dari",
129128
"fat": "Ffanti",
130129
"ff": "Ffwla",
131130
"fi": "Ffinneg",
@@ -523,6 +522,7 @@
523522
"es_419": "Sbaeneg America Ladin",
524523
"es_ES": "Sbaeneg Ewrop",
525524
"es_MX": "Sbaeneg Mecsico",
525+
"fa_AF": "Dari",
526526
"fr_CA": "Ffrangeg Canada",
527527
"fr_CH": "Ffrangeg y Swistir",
528528
"nds_NL": "Sacsoneg Isel",

Resources/data/languages/da.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@
128128
"eu": "baskisk",
129129
"ewo": "ewondo",
130130
"fa": "persisk",
131-
"fa_AF": "dari",
132131
"fan": "fang",
133132
"fat": "fanti",
134133
"ff": "fulah",
@@ -522,6 +521,7 @@
522521
"es_419": "latinamerikansk spansk",
523522
"es_ES": "europæisk spansk",
524523
"es_MX": "mexicansk spansk",
524+
"fa_AF": "dari",
525525
"fr_CA": "canadisk fransk",
526526
"fr_CH": "schweizisk fransk",
527527
"nl_BE": "flamsk",

Resources/data/languages/de.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@
150150
"ewo": "Ewondo",
151151
"ext": "Extremadurisch",
152152
"fa": "Persisch",
153-
"fa_AF": "Dari",
154153
"fan": "Pangwe",
155154
"fat": "Fanti",
156155
"ff": "Ful",
@@ -599,6 +598,7 @@
599598
"ar_001": "Modernes Hocharabisch",
600599
"de_AT": "Österreichisches Deutsch",
601600
"de_CH": "Schweizer Hochdeutsch",
601+
"fa_AF": "Dari",
602602
"nds_NL": "Niedersächsisch",
603603
"nl_BE": "Flämisch",
604604
"ro_MD": "Moldauisch",

Resources/data/languages/el.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@
128128
"eu": "Βασκικά",
129129
"ewo": "Εγουόντο",
130130
"fa": "Περσικά",
131-
"fa_AF": "Νταρί",
132131
"fan": "Φανγκ",
133132
"fat": "Φάντι",
134133
"ff": "Φουλά",
@@ -518,6 +517,7 @@
518517
"es_419": "Ισπανικά Λατινικής Αμερικής",
519518
"es_ES": "Ισπανικά Ευρώπης",
520519
"es_MX": "Ισπανικά Μεξικού",
520+
"fa_AF": "Νταρί",
521521
"fr_CA": "Γαλλικά Καναδά",
522522
"fr_CH": "Γαλλικά Ελβετίας",
523523
"nds_NL": "Κάτω Γερμανικά Ολλανδίας",

Resources/data/languages/es.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@
128128
"eu": "euskera",
129129
"ewo": "ewondo",
130130
"fa": "persa",
131-
"fa_AF": "darí",
132131
"fan": "fang",
133132
"fat": "fanti",
134133
"ff": "fula",
@@ -522,6 +521,7 @@
522521
"es_419": "español latinoamericano",
523522
"es_ES": "español de España",
524523
"es_MX": "español de México",
524+
"fa_AF": "darí",
525525
"fr_CA": "francés canadiense",
526526
"fr_CH": "francés suizo",
527527
"nds_NL": "bajo sajón",

Resources/data/languages/es_419.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"es_419": "español latinoamericano",
4343
"es_ES": "español de España",
4444
"es_MX": "español de México",
45+
"fa_AF": "darí",
4546
"fr_CA": "francés canadiense",
4647
"fr_CH": "francés suizo",
4748
"nl_BE": "flamenco",

Resources/data/languages/es_US.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"gmh": "alemán de la alta edad media",
1717
"grc": "griego antiguo",
1818
"gu": "gurayatí",
19-
"hak": "hak",
2019
"hil": "hiligainón",
2120
"hsn": "xiang (China)",
2221
"ht": "criollo haitiano",
@@ -26,10 +25,8 @@
2625
"lo": "lao",
2726
"lus": "lushai",
2827
"mga": "irlandés medieval",
29-
"nan": "nan",
3028
"nr": "ndebele meridional",
3129
"nso": "sotho septentrional",
32-
"pcm": "pcm",
3330
"rm": "romanche",
3431
"rn": "kiroundi",
3532
"shu": "árabe chadiano",
@@ -41,7 +38,6 @@
4138
"tn": "setchwana",
4239
"tyv": "tuviniano",
4340
"wo": "wolof",
44-
"wuu": "wuu",
4541
"xal": "kalmyk"
4642
},
4743
"LocalizedNames": {

Resources/data/languages/et.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@
148148
"ewo": "evondo",
149149
"ext": "estremenju",
150150
"fa": "pärsia",
151-
"fa_AF": "dari",
152151
"fan": "fangi",
153152
"fat": "fanti",
154153
"ff": "fula",
@@ -597,6 +596,7 @@
597596
"es_419": "Ladina-Ameerika hispaania",
598597
"es_ES": "Euroopa hispaania",
599598
"es_MX": "Mehhiko hispaania",
599+
"fa_AF": "dari",
600600
"fr_CA": "Kanada prantsuse",
601601
"fr_CH": "Šveitsi prantsuse",
602602
"nds_NL": "Hollandi alamsaksa",

Resources/data/languages/eu.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@
8787
"eu": "euskara",
8888
"ewo": "ewondera",
8989
"fa": "persiera",
90-
"fa_AF": "daria",
9190
"ff": "fula",
9291
"fi": "finlandiera",
9392
"fil": "filipinera",
@@ -390,6 +389,7 @@
390389
"es_419": "Latinoamerikako espainiera",
391390
"es_ES": "espainiera (Europa)",
392391
"es_MX": "Mexikoko espainiera",
392+
"fa_AF": "daria",
393393
"fr_CA": "Kanadako frantses",
394394
"fr_CH": "Suitzako frantses",
395395
"nds_NL": "behe-saxoiera",

0 commit comments

Comments
 (0)