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ó",

0 commit comments

Comments
 (0)