Merge branch 'upstream'
Former-commit-id: ea715b39fd45e9d8f3a97228a81fbfeb09dbf221
This commit is contained in:
commit
669af6ee1d
@ -1 +1 @@
|
|||||||
9b2fd835af009b5dd6dd4db4bed39050a935a5ea
|
1d1a992d5d686e5e5a56a2b642a4ff4fb51b4572
|
@ -1 +1 @@
|
|||||||
31d01c63c1999848cd2cd8c491268eca5b0f9084
|
3d010c3c72782d1747bbaf1811af2abd135789c7
|
@ -34,7 +34,7 @@ static class Consts
|
|||||||
// Use these assembly version constants to make code more maintainable.
|
// Use these assembly version constants to make code more maintainable.
|
||||||
//
|
//
|
||||||
|
|
||||||
public const string MonoVersion = "5.18.0.142";
|
public const string MonoVersion = "5.18.0.143";
|
||||||
public const string MonoCompany = "Mono development team";
|
public const string MonoCompany = "Mono development team";
|
||||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||||
public const string MonoCopyright = "(c) Various Mono authors";
|
public const string MonoCopyright = "(c) Various Mono authors";
|
||||||
|
@ -633,10 +633,13 @@ namespace System.Security.Cryptography.X509Certificates
|
|||||||
if (!culture.DateTimeFormat.Calendar.IsValidDay (date.Year, date.Month, date.Day, 0)) {
|
if (!culture.DateTimeFormat.Calendar.IsValidDay (date.Year, date.Month, date.Day, 0)) {
|
||||||
// The most common case of culture failing to work is in the Um-AlQuara calendar. In this case,
|
// The most common case of culture failing to work is in the Um-AlQuara calendar. In this case,
|
||||||
// we can fall back to the Hijri calendar, otherwise fall back to the invariant culture.
|
// we can fall back to the Hijri calendar, otherwise fall back to the invariant culture.
|
||||||
|
#if !MOBILE
|
||||||
if (culture.DateTimeFormat.Calendar is UmAlQuraCalendar) {
|
if (culture.DateTimeFormat.Calendar is UmAlQuraCalendar) {
|
||||||
culture = culture.Clone () as CultureInfo;
|
culture = culture.Clone () as CultureInfo;
|
||||||
culture.DateTimeFormat.Calendar = new HijriCalendar ();
|
culture.DateTimeFormat.Calendar = new HijriCalendar ();
|
||||||
} else {
|
} else
|
||||||
|
#endif
|
||||||
|
{
|
||||||
culture = CultureInfo.InvariantCulture;
|
culture = CultureInfo.InvariantCulture;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1 +1 @@
|
|||||||
409fdf3ca6ce6639a2a9e055114afb62e104b8dc
|
802f26e849d2fc0c518a08551c06344ae8cf7d6e
|
@ -1 +1 @@
|
|||||||
b3da2d3903548b23f6b0c021fe1642efd01cf2b2
|
96ffb57600ed1b0c09ec7c645300e6adcbf8aed6
|
@ -1 +1 @@
|
|||||||
1b165af598037e6a4228ebdf2950ca338534b9dc
|
17a35b9e6d8a06b7edb722425c155310f85db0da
|
Binary file not shown.
@ -1 +1 @@
|
|||||||
46236ad7acc056c1c10a13d7cecdec9233991e41
|
4f938aeefd3cfc658764d0385e2181e6ac575cb2
|
@ -1 +1 @@
|
|||||||
b7746223c709fb771b2b185e5f900f657c06ceb8
|
299a0f7a03122cba58b13178572d5e4d16475bc2
|
@ -1 +1 @@
|
|||||||
aeec656d52ce933e620be5c419a560d8ac8323a3
|
03321a8395d80950b148ecb656024bdbb889bc4c
|
@ -1 +1 @@
|
|||||||
e3c1398a8ed2d1f8a91ade82741b81f351a1f3fe
|
b08364e80d951757ca9729410a9ad44a06b05431
|
@ -1 +1 @@
|
|||||||
409fdf3ca6ce6639a2a9e055114afb62e104b8dc
|
802f26e849d2fc0c518a08551c06344ae8cf7d6e
|
@ -1 +1 @@
|
|||||||
b3da2d3903548b23f6b0c021fe1642efd01cf2b2
|
96ffb57600ed1b0c09ec7c645300e6adcbf8aed6
|
@ -1 +1 @@
|
|||||||
1b165af598037e6a4228ebdf2950ca338534b9dc
|
17a35b9e6d8a06b7edb722425c155310f85db0da
|
Binary file not shown.
@ -1 +1 @@
|
|||||||
46236ad7acc056c1c10a13d7cecdec9233991e41
|
4f938aeefd3cfc658764d0385e2181e6ac575cb2
|
@ -1 +1 @@
|
|||||||
b7746223c709fb771b2b185e5f900f657c06ceb8
|
299a0f7a03122cba58b13178572d5e4d16475bc2
|
@ -1 +1 @@
|
|||||||
aeec656d52ce933e620be5c419a560d8ac8323a3
|
03321a8395d80950b148ecb656024bdbb889bc4c
|
@ -1 +1 @@
|
|||||||
e3c1398a8ed2d1f8a91ade82741b81f351a1f3fe
|
b08364e80d951757ca9729410a9ad44a06b05431
|
@ -1 +1 @@
|
|||||||
409fdf3ca6ce6639a2a9e055114afb62e104b8dc
|
802f26e849d2fc0c518a08551c06344ae8cf7d6e
|
@ -1 +1 @@
|
|||||||
b3da2d3903548b23f6b0c021fe1642efd01cf2b2
|
96ffb57600ed1b0c09ec7c645300e6adcbf8aed6
|
@ -1 +1 @@
|
|||||||
1b165af598037e6a4228ebdf2950ca338534b9dc
|
17a35b9e6d8a06b7edb722425c155310f85db0da
|
Binary file not shown.
@ -1 +1 @@
|
|||||||
46236ad7acc056c1c10a13d7cecdec9233991e41
|
4f938aeefd3cfc658764d0385e2181e6ac575cb2
|
@ -1 +1 @@
|
|||||||
b7746223c709fb771b2b185e5f900f657c06ceb8
|
299a0f7a03122cba58b13178572d5e4d16475bc2
|
@ -1 +1 @@
|
|||||||
aeec656d52ce933e620be5c419a560d8ac8323a3
|
03321a8395d80950b148ecb656024bdbb889bc4c
|
@ -1 +1 @@
|
|||||||
e3c1398a8ed2d1f8a91ade82741b81f351a1f3fe
|
b08364e80d951757ca9729410a9ad44a06b05431
|
@ -1 +1 @@
|
|||||||
409fdf3ca6ce6639a2a9e055114afb62e104b8dc
|
802f26e849d2fc0c518a08551c06344ae8cf7d6e
|
@ -1 +1 @@
|
|||||||
b3da2d3903548b23f6b0c021fe1642efd01cf2b2
|
96ffb57600ed1b0c09ec7c645300e6adcbf8aed6
|
@ -1 +1 @@
|
|||||||
1b165af598037e6a4228ebdf2950ca338534b9dc
|
17a35b9e6d8a06b7edb722425c155310f85db0da
|
Binary file not shown.
@ -1 +1 @@
|
|||||||
46236ad7acc056c1c10a13d7cecdec9233991e41
|
4f938aeefd3cfc658764d0385e2181e6ac575cb2
|
@ -1 +1 @@
|
|||||||
b7746223c709fb771b2b185e5f900f657c06ceb8
|
299a0f7a03122cba58b13178572d5e4d16475bc2
|
@ -1 +1 @@
|
|||||||
aeec656d52ce933e620be5c419a560d8ac8323a3
|
03321a8395d80950b148ecb656024bdbb889bc4c
|
@ -1 +1 @@
|
|||||||
e3c1398a8ed2d1f8a91ade82741b81f351a1f3fe
|
b08364e80d951757ca9729410a9ad44a06b05431
|
@ -1 +1 @@
|
|||||||
#define FULL_VERSION "explicit/e257971"
|
#define FULL_VERSION "explicit/7001d39"
|
||||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
|||||||
47f068d9ed2b548bfb7cbbd6204b7e79035d24d8
|
78239b67287e0119ad54995cb24f6b91c661e6b6
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
|||||||
36ca5609525ece759b302af026a23b871df72be9
|
9e6cac8263116bf353aef87a985bb27e8fe23d14
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
|||||||
d8e18aeccf22b4521dd21a2ebe3c0bb4a586601f
|
2994aeab9436e3561f410758103abd4e0516415a
|
@ -6,9 +6,9 @@
|
|||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: mono 5.18.0.142\n"
|
"Project-Id-Version: mono 5.18.0.143\n"
|
||||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||||
"POT-Creation-Date: 2018-10-09 08:04+0000\n"
|
"POT-Creation-Date: 2018-10-10 08:22+0000\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
|||||||
2ed47baa91e0d1289a19e77b0c7b50a13bb16951
|
1f97ee37e9c6e6e80909d2136d1b5e3a0160241a
|
Loading…
x
Reference in New Issue
Block a user