Skip to content

Commit 433a275

Browse files
tylermenezestylermenezes
committed
Merge remote-tracking branch 'refs/remotes/origin/master'
2 parents 891d6ee + 23da8af commit 433a275

1 file changed

Lines changed: 70 additions & 14 deletions

File tree

‎packages/i18n/messages/.fingerprints.json‎

Lines changed: 70 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,21 @@
88
"topo_datacollection_payment_notice": "facb19c3f60786c8",
99
"topo_datacollection_pii_notice": "04d2149012578d97",
1010
"topo_footer_ccpa": "b82b0a0e20e97647",
11+
"topo_footer_community": "fce9814c289e6b71",
1112
"topo_footer_cookie_policy": "0e90f7d03d3b19c7",
1213
"topo_footer_copyright": "58db5525b87e18d1",
13-
"topo_footer_custom_links": "90a23feda18934e0",
1414
"topo_footer_disclaimer": "53fa1b5b6487d12f",
1515
"topo_footer_maintained_by": "96a06602844d15b3",
16+
<<<<<<< HEAD
17+
=======
18+
"topo_footer_navigation": "25ccf0f5361756e7",
19+
"topo_footer_nonprofit": "7cba7a64b4f3d671",
20+
"topo_footer_organization": "05f6f85efd8925dc",
21+
>>>>>>> refs/remotes/origin/master
1622
"topo_footer_privacy_policy": "0afb547bbe92b243",
1723
"topo_footer_privacy_settings": "34107bd23714e490",
18-
"topo_footer_resources": "9deac3e17aae64bc",
24+
"topo_footer_prs_welcome": "aa116d2cf88acce1",
25+
"topo_footer_support": "7744c89b4e37c0a5",
1926
"topo_footer_terms_of_service": "29e6fa122da88e0e",
2027
"topo_languageswitcher_label": "67cd100f41b93d33",
2128
"topo_mailinglist_error": "b90cdd20dbd79918",
@@ -341,6 +348,7 @@
341348
"www_navmenu_volunteer": "ffbb2c196c9cc5bd",
342349
"www_page_disclaimer_heading": "a8c25b6421934d49",
343350
"www_page_site_name": "85edec358609184e",
351+
"www_page_trademark_notices": "ba171778756ebd7d",
344352
"www_press_as_seen_in": "ba252d0ebbc655e1",
345353
"www_press_assets": "5412c1a30668d0bc",
346354
"www_press_assets_license": "69cce7550e7a1521",
@@ -571,14 +579,21 @@
571579
"topo_datacollection_payment_notice": "facb19c3f60786c8",
572580
"topo_datacollection_pii_notice": "04d2149012578d97",
573581
"topo_footer_ccpa": "b82b0a0e20e97647",
582+
"topo_footer_community": "fce9814c289e6b71",
574583
"topo_footer_cookie_policy": "0e90f7d03d3b19c7",
575584
"topo_footer_copyright": "58db5525b87e18d1",
576-
"topo_footer_custom_links": "90a23feda18934e0",
577585
"topo_footer_disclaimer": "53fa1b5b6487d12f",
578586
"topo_footer_maintained_by": "96a06602844d15b3",
587+
<<<<<<< HEAD
588+
=======
589+
"topo_footer_navigation": "25ccf0f5361756e7",
590+
"topo_footer_nonprofit": "7cba7a64b4f3d671",
591+
"topo_footer_organization": "05f6f85efd8925dc",
592+
>>>>>>> refs/remotes/origin/master
579593
"topo_footer_privacy_policy": "0afb547bbe92b243",
580594
"topo_footer_privacy_settings": "34107bd23714e490",
581-
"topo_footer_resources": "9deac3e17aae64bc",
595+
"topo_footer_prs_welcome": "aa116d2cf88acce1",
596+
"topo_footer_support": "7744c89b4e37c0a5",
582597
"topo_footer_terms_of_service": "29e6fa122da88e0e",
583598
"topo_languageswitcher_label": "67cd100f41b93d33",
584599
"topo_mailinglist_error": "b90cdd20dbd79918",
@@ -904,6 +919,7 @@
904919
"www_navmenu_volunteer": "ffbb2c196c9cc5bd",
905920
"www_page_disclaimer_heading": "a8c25b6421934d49",
906921
"www_page_site_name": "85edec358609184e",
922+
"www_page_trademark_notices": "ba171778756ebd7d",
907923
"www_press_as_seen_in": "ba252d0ebbc655e1",
908924
"www_press_assets": "5412c1a30668d0bc",
909925
"www_press_assets_license": "69cce7550e7a1521",
@@ -1134,14 +1150,21 @@
11341150
"topo_datacollection_payment_notice": "facb19c3f60786c8",
11351151
"topo_datacollection_pii_notice": "04d2149012578d97",
11361152
"topo_footer_ccpa": "b82b0a0e20e97647",
1153+
"topo_footer_community": "fce9814c289e6b71",
11371154
"topo_footer_cookie_policy": "0e90f7d03d3b19c7",
11381155
"topo_footer_copyright": "58db5525b87e18d1",
1139-
"topo_footer_custom_links": "90a23feda18934e0",
11401156
"topo_footer_disclaimer": "53fa1b5b6487d12f",
11411157
"topo_footer_maintained_by": "96a06602844d15b3",
1158+
<<<<<<< HEAD
1159+
=======
1160+
"topo_footer_navigation": "25ccf0f5361756e7",
1161+
"topo_footer_nonprofit": "7cba7a64b4f3d671",
1162+
"topo_footer_organization": "05f6f85efd8925dc",
1163+
>>>>>>> refs/remotes/origin/master
11421164
"topo_footer_privacy_policy": "0afb547bbe92b243",
11431165
"topo_footer_privacy_settings": "34107bd23714e490",
1144-
"topo_footer_resources": "9deac3e17aae64bc",
1166+
"topo_footer_prs_welcome": "aa116d2cf88acce1",
1167+
"topo_footer_support": "7744c89b4e37c0a5",
11451168
"topo_footer_terms_of_service": "29e6fa122da88e0e",
11461169
"topo_languageswitcher_label": "67cd100f41b93d33",
11471170
"topo_mailinglist_error": "b90cdd20dbd79918",
@@ -1467,6 +1490,7 @@
14671490
"www_navmenu_volunteer": "ffbb2c196c9cc5bd",
14681491
"www_page_disclaimer_heading": "a8c25b6421934d49",
14691492
"www_page_site_name": "85edec358609184e",
1493+
"www_page_trademark_notices": "ba171778756ebd7d",
14701494
"www_press_as_seen_in": "ba252d0ebbc655e1",
14711495
"www_press_assets": "5412c1a30668d0bc",
14721496
"www_press_assets_license": "69cce7550e7a1521",
@@ -1697,14 +1721,21 @@
16971721
"topo_datacollection_payment_notice": "facb19c3f60786c8",
16981722
"topo_datacollection_pii_notice": "04d2149012578d97",
16991723
"topo_footer_ccpa": "b82b0a0e20e97647",
1724+
"topo_footer_community": "fce9814c289e6b71",
17001725
"topo_footer_cookie_policy": "0e90f7d03d3b19c7",
17011726
"topo_footer_copyright": "58db5525b87e18d1",
1702-
"topo_footer_custom_links": "90a23feda18934e0",
17031727
"topo_footer_disclaimer": "53fa1b5b6487d12f",
17041728
"topo_footer_maintained_by": "96a06602844d15b3",
1729+
<<<<<<< HEAD
1730+
=======
1731+
"topo_footer_navigation": "25ccf0f5361756e7",
1732+
"topo_footer_nonprofit": "7cba7a64b4f3d671",
1733+
"topo_footer_organization": "05f6f85efd8925dc",
1734+
>>>>>>> refs/remotes/origin/master
17051735
"topo_footer_privacy_policy": "0afb547bbe92b243",
17061736
"topo_footer_privacy_settings": "34107bd23714e490",
1707-
"topo_footer_resources": "9deac3e17aae64bc",
1737+
"topo_footer_prs_welcome": "aa116d2cf88acce1",
1738+
"topo_footer_support": "7744c89b4e37c0a5",
17081739
"topo_footer_terms_of_service": "29e6fa122da88e0e",
17091740
"topo_languageswitcher_label": "67cd100f41b93d33",
17101741
"topo_mailinglist_error": "b90cdd20dbd79918",
@@ -2030,6 +2061,7 @@
20302061
"www_navmenu_volunteer": "ffbb2c196c9cc5bd",
20312062
"www_page_disclaimer_heading": "a8c25b6421934d49",
20322063
"www_page_site_name": "85edec358609184e",
2064+
"www_page_trademark_notices": "ba171778756ebd7d",
20332065
"www_press_as_seen_in": "ba252d0ebbc655e1",
20342066
"www_press_assets": "5412c1a30668d0bc",
20352067
"www_press_assets_license": "69cce7550e7a1521",
@@ -2260,14 +2292,21 @@
22602292
"topo_datacollection_payment_notice": "facb19c3f60786c8",
22612293
"topo_datacollection_pii_notice": "04d2149012578d97",
22622294
"topo_footer_ccpa": "b82b0a0e20e97647",
2295+
"topo_footer_community": "fce9814c289e6b71",
22632296
"topo_footer_cookie_policy": "0e90f7d03d3b19c7",
22642297
"topo_footer_copyright": "58db5525b87e18d1",
2265-
"topo_footer_custom_links": "90a23feda18934e0",
22662298
"topo_footer_disclaimer": "53fa1b5b6487d12f",
22672299
"topo_footer_maintained_by": "96a06602844d15b3",
2300+
<<<<<<< HEAD
2301+
=======
2302+
"topo_footer_navigation": "25ccf0f5361756e7",
2303+
"topo_footer_nonprofit": "7cba7a64b4f3d671",
2304+
"topo_footer_organization": "05f6f85efd8925dc",
2305+
>>>>>>> refs/remotes/origin/master
22682306
"topo_footer_privacy_policy": "0afb547bbe92b243",
22692307
"topo_footer_privacy_settings": "34107bd23714e490",
2270-
"topo_footer_resources": "9deac3e17aae64bc",
2308+
"topo_footer_prs_welcome": "aa116d2cf88acce1",
2309+
"topo_footer_support": "7744c89b4e37c0a5",
22712310
"topo_footer_terms_of_service": "29e6fa122da88e0e",
22722311
"topo_languageswitcher_label": "67cd100f41b93d33",
22732312
"topo_mailinglist_error": "b90cdd20dbd79918",
@@ -2593,6 +2632,7 @@
25932632
"www_navmenu_volunteer": "ffbb2c196c9cc5bd",
25942633
"www_page_disclaimer_heading": "a8c25b6421934d49",
25952634
"www_page_site_name": "85edec358609184e",
2635+
"www_page_trademark_notices": "ba171778756ebd7d",
25962636
"www_press_as_seen_in": "ba252d0ebbc655e1",
25972637
"www_press_assets": "5412c1a30668d0bc",
25982638
"www_press_assets_license": "69cce7550e7a1521",
@@ -2823,14 +2863,21 @@
28232863
"topo_datacollection_payment_notice": "facb19c3f60786c8",
28242864
"topo_datacollection_pii_notice": "04d2149012578d97",
28252865
"topo_footer_ccpa": "b82b0a0e20e97647",
2866+
"topo_footer_community": "fce9814c289e6b71",
28262867
"topo_footer_cookie_policy": "0e90f7d03d3b19c7",
28272868
"topo_footer_copyright": "58db5525b87e18d1",
2828-
"topo_footer_custom_links": "90a23feda18934e0",
28292869
"topo_footer_disclaimer": "53fa1b5b6487d12f",
28302870
"topo_footer_maintained_by": "96a06602844d15b3",
2871+
<<<<<<< HEAD
2872+
=======
2873+
"topo_footer_navigation": "25ccf0f5361756e7",
2874+
"topo_footer_nonprofit": "7cba7a64b4f3d671",
2875+
"topo_footer_organization": "05f6f85efd8925dc",
2876+
>>>>>>> refs/remotes/origin/master
28312877
"topo_footer_privacy_policy": "0afb547bbe92b243",
28322878
"topo_footer_privacy_settings": "34107bd23714e490",
2833-
"topo_footer_resources": "9deac3e17aae64bc",
2879+
"topo_footer_prs_welcome": "aa116d2cf88acce1",
2880+
"topo_footer_support": "7744c89b4e37c0a5",
28342881
"topo_footer_terms_of_service": "29e6fa122da88e0e",
28352882
"topo_languageswitcher_label": "67cd100f41b93d33",
28362883
"topo_mailinglist_error": "b90cdd20dbd79918",
@@ -3156,6 +3203,7 @@
31563203
"www_navmenu_volunteer": "ffbb2c196c9cc5bd",
31573204
"www_page_disclaimer_heading": "a8c25b6421934d49",
31583205
"www_page_site_name": "85edec358609184e",
3206+
"www_page_trademark_notices": "ba171778756ebd7d",
31593207
"www_press_as_seen_in": "ba252d0ebbc655e1",
31603208
"www_press_assets": "5412c1a30668d0bc",
31613209
"www_press_assets_license": "69cce7550e7a1521",
@@ -3386,14 +3434,21 @@
33863434
"topo_datacollection_payment_notice": "facb19c3f60786c8",
33873435
"topo_datacollection_pii_notice": "04d2149012578d97",
33883436
"topo_footer_ccpa": "b82b0a0e20e97647",
3437+
"topo_footer_community": "fce9814c289e6b71",
33893438
"topo_footer_cookie_policy": "0e90f7d03d3b19c7",
33903439
"topo_footer_copyright": "58db5525b87e18d1",
3391-
"topo_footer_custom_links": "90a23feda18934e0",
33923440
"topo_footer_disclaimer": "53fa1b5b6487d12f",
33933441
"topo_footer_maintained_by": "96a06602844d15b3",
3442+
<<<<<<< HEAD
3443+
=======
3444+
"topo_footer_navigation": "25ccf0f5361756e7",
3445+
"topo_footer_nonprofit": "7cba7a64b4f3d671",
3446+
"topo_footer_organization": "05f6f85efd8925dc",
3447+
>>>>>>> refs/remotes/origin/master
33943448
"topo_footer_privacy_policy": "0afb547bbe92b243",
33953449
"topo_footer_privacy_settings": "34107bd23714e490",
3396-
"topo_footer_resources": "9deac3e17aae64bc",
3450+
"topo_footer_prs_welcome": "aa116d2cf88acce1",
3451+
"topo_footer_support": "7744c89b4e37c0a5",
33973452
"topo_footer_terms_of_service": "29e6fa122da88e0e",
33983453
"topo_languageswitcher_label": "67cd100f41b93d33",
33993454
"topo_mailinglist_error": "b90cdd20dbd79918",
@@ -3719,6 +3774,7 @@
37193774
"www_navmenu_volunteer": "ffbb2c196c9cc5bd",
37203775
"www_page_disclaimer_heading": "a8c25b6421934d49",
37213776
"www_page_site_name": "85edec358609184e",
3777+
"www_page_trademark_notices": "ba171778756ebd7d",
37223778
"www_press_as_seen_in": "ba252d0ebbc655e1",
37233779
"www_press_assets": "5412c1a30668d0bc",
37243780
"www_press_assets_license": "69cce7550e7a1521",

0 commit comments

Comments
 (0)