Skip to content

Commit 6247577

Browse files
authored
Merge branch 'keepandroidopen:main' into main
2 parents 0a1ff0a + 94c480f commit 6247577

File tree

4 files changed

+27
-7
lines changed

4 files changed

+27
-7
lines changed

public/banner.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
da: "Android vil blive en lukket platform om",
3737
nl: "Android zal een gesloten platform worden over",
3838
el: "\u03A4\u03BF Android \u03B8\u03B1 \u03B3\u03AF\u03BD\u03B5\u03B9 \u03BC\u03AF\u03B1 \u03BA\u03BB\u03B5\u03B9\u03C3\u03C4\u03AE \u03C0\u03BB\u03B1\u03C4\u03C6\u03CC\u03C1\u03BC\u03B1",
39-
es: "Android se convertir\u00E1 en una plataforma cerrada",
39+
es: "Android se convertir\u00E1 en una plataforma cerrada en",
4040
fr: "Android va devenir une plateforme ferm\u00E9e dans",
4141
id: "Android akan menjadi platform yang terkunci.",
4242
it: "Android diventer\u00E0 una piattaforma bloccata",
4343
ko: "Android\uAC00 \uD3D0\uC1C4\uB41C \uD50C\uB7AB\uD3FC\uC774 \uB418\uAE30\uAE4C\uC9C0 \uB0A8\uC740 \uC2DC\uAC04:",
4444
pl: "Android stanie si\u0119 platform\u0105 zamkni\u0119t\u0105 za",
45-
"pt-BR": "O Android se tornar\u00E1 uma plataforma fechada",
45+
"pt-BR": "O Android se tornar\u00E1 uma plataforma fechada em",
4646
ru: "Android \u0441\u0442\u0430\u043D\u0435\u0442 \u0437\u0430\u043A\u0440\u044B\u0442\u043E\u0439 \u043F\u043B\u0430\u0442\u0444\u043E\u0440\u043C\u043E\u0439 \u0447\u0435\u0440\u0435\u0437",
4747
sk: "Android sa stane uzamknutou platformou",
4848
th: "Android\u0E08\u0E30\u0E40\u0E1B\u0E47\u0E19\u0E41\u0E1E\u0E25\u0E15\u0E1F\u0E2D\u0E23\u0E4C\u0E21\u0E17\u0E35\u0E48\u0E16\u0E39\u0E01\u0E25\u0E47\u0E2D\u0E01",

src/content/pages/en/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ On March 19, 2026, Google [published details](https://android-developers.googleb
5050
1. Enable [Developer Mode](https://www.android.com/intl/en_uk/articles/enable-android-developer-settings/) by tapping the software build number in _About Phone_ **seven times**
5151
1. In Settings > System, open Developer Options and scroll down to “Allow Unverified Packages.”
5252
1. Flip the toggle and answer a scare screen confirming that you are not being coerced
53-
1. Enter our device unlock pin/password
53+
1. Enter your device unlock pin/password
5454
1. Restart your device
5555
1. **Wait 24 hours**
56-
1. Return to the unverified packages menu at the end of the security delay
56+
1. Return to the _unverified packages_ menu at the end of the security delay
5757
1. Scroll past additional scare screen warnings and select either “Allow temporarily” (seven days) or “Allow indefinitely.”
5858
1. On the next scare screen, confirm that you understand the risks.
5959
1. You can now install unverified packages on the device by tapping the “Install anyway” option in the package manager.

src/content/pages/zh-CN/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ open_letter_cta: "阅读我们反对安卓开发者验证计划的公开信"
2222
{:.li-list .li-money}
2323
- 同意Google的条款及其条件
2424
{:.li-list .li-terms}
25-
- 提供身份证明
25+
- 提供政府的身份证明
2626
{:.li-list .li-id}
2727
- 上传开发者的私人签名密钥证明
2828
{:.li-list .li-signing}

src/data/regulators.yaml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ intro:
4545
uk: "Регулятори в усьому світі щиро занепокоєні монополіями та централізацією влади в технологічному секторі й хочуть чути безпосередньо від людей, яких це стосується та турбує. Звертаючись до регуляторів, ви повинні бути _ввічливими_ та _конкретними_ щодо шкоди, яку, на вашу думку, завдадуть ці політики як споживачам, так і конкуренції."
4646
pl: "Regulatorzy na całym świecie realnie martwią się monopolami i centralizacją władzy w sektorze technologicznym oraz chcą usłyszeć bezpośrednio od osób, których to dotyczy i które są zaniepokojone. Kontaktując się z regulatorami, bądź _uprzejmy_ i _konkretny_ w opisie szkód, jakie — Twoim zdaniem — spowodują te polityki, zarówno dla konsumentów, jak i dla konkurencji."
4747
pt-BR: "Os reguladores em todo o mundo estão genuinamente preocupados com monopólios e a centralização de poder no setor de tecnologia, e querem ouvir diretamente de indivíduos que são afetados e preocupados. Ao contatar os reguladores diretamente, você deve ser _educado_ e _específico_ sobre o dano que acredita que essas políticas causarão, tanto aos consumidores quanto à concorrência."
48-
zh-CN: "全球各地的监管机构对科技领域的垄断和权力集中深表关切,并希望直接倾听受到影响和关注此事的个人的声音。在直接联系监管机构时,您应该保持_礼貌_,并_具体_说明您认为这些政策将对消费者和竞争造成的危害"
49-
zh-TW: "全球各地的監管機構對科技領域的壟斷和權力集中深表關切,並希望直接傾聽受到影響和關注此事的個人的聲音。在直接聯絡監管機構時,您應該保持_禮貌_,並_具體_說明您認為這些政策將對消費者和競爭造成的危害"
48+
zh-CN: "全球各地的监管机构对科技领域的垄断和权力集中深表关切,并希望直接倾听受到影响和关注此事的个人的声音。在直接联系监管机构时,您应该保持 _礼貌_ ,并 _具体_ 说明您认为这些政策将对消费者和竞争造成的危害"
49+
zh-TW: "全球各地的監管機構對科技領域的壟斷和權力集中深表關切,並希望直接傾聽受到影響和關注此事的個人的聲音。在直接聯絡監管機構時,您應該保持 _禮貌_ ,並 _具體_ 說明您認為這些政策將對消費者和競爭造成的危害"
5050
ja: "世界中の規制当局は、テクノロジー業界における独占と権力の集中を真に懸念しており、影響を受け懸念を抱く個人から直接意見を聞きたいと考えています。規制当局に直接連絡する際は、これらの政策が消費者と競争の両方に与えると考えられる害について、_礼儀正しく_、_具体的_ に述べてください。"
5151
vi: "Các cơ quan quản lý trên toàn thế giới quan ngại sâu sắc về sự độc quyền và tập trung quyền lực trong lĩnh vực công nghệ, đồng thời muốn lắng nghe ý kiến ​​trực tiếp từ những cá nhân bị ảnh hưởng và có liên quan. Khi liên hệ trực tiếp với cơ quan quản lý, bạn phải _lịch sự_ và giải thích _cụ thể_ về tác hại mà bạn tin rằng những chính sách này sẽ gây ra cho người tiêu dùng và sự cạnh tranh."
5252

@@ -1572,13 +1572,16 @@ countries:
15721572
name:
15731573
en: "Denmark"
15741574
da: "Danmark"
1575+
zh-CN: "丹麦"
15751576
items:
15761577
- text:
15771578
en: "Contact the Danish [Consumer Ombudsman](https://forbrugerombudsmanden.dk/consumer-ombudsman)"
15781579
da: "Kontakt [Forbrugerombudsmanden](https://forbrugerombudsmanden.dk/)"
1580+
zh-CN: "联系丹麦[消费者申诉专员](https://forbrugerombudsmanden.dk/consumer-ombudsman)"
15791581
- text:
15801582
en: "Contact the Danish Competition and Consumer Authority's [Tech Division](https://en.kfst.dk/competition/contact-a-competition-division/tech)"
15811583
da: "Kontakt Konkurrence- og Forbrugerstyrelsens [Center for Tech](https://kfst.dk/konkurrenceforhold/kontakt-et-konkurrencecenter/center-for-tech-tech)"
1584+
zh-CN: "联系丹麦竞争与消费者管理局的[技术部门](https://en.kfst.dk/competition/contact-a-competition-division/tech)"
15821585
- id: czech-republic
15831586
name:
15841587
ar: "الجمهورية التشيكية"
@@ -1678,11 +1681,14 @@ countries:
16781681
- id: lithuania
16791682
name:
16801683
en: "Lithuania"
1684+
zh-CN: "立陶宛"
16811685
items:
16821686
- text:
16831687
en: "Email: [tarnyba@vvtat.lt](mailto:tarnyba@vvtat.lt?cc=lithuania@keepandroidopen.org) [taryba@kt.gov.lt](mailto:taryba@kt.gov.lt?cc=lithuania@keepandroidopen.org)"
1688+
zh-CN: "电子邮件:[tarnyba@vvtat.lt](mailto:tarnyba@vvtat.lt?cc=lithuania@keepandroidopen.org) [taryba@kt.gov.lt](mailto:taryba@kt.gov.lt?cc=lithuania@keepandroidopen.org)"
16841689
- text:
16851690
en: "Contact the [State Consumer Rights Protection Authority (SCRPA) (Valstybinė vartotojų teisių apsaugos tarnyba)](https://vvtat.lrv.lt/lt/) [Complaint portal](https://vtis.lt/) [The Competition Council of the Republic of Lithuania (KT) (Lietuvos Respublikos konkurencijos taryba)](https://kt.gov.lt/) [Complaint portal](https://kt.gov.lt/lt/formos/pranesimas-apie-karteli/)"
1691+
zh-CN: "联系[国家消费者权益保护局 (SCRPA) (Valstybinė vartotojų teisių apsaugos tarnyba)](https://vvtat.lrv.lt/lt/) [投诉入口](https://vtis.lt/) [立陶宛共和国竞争委员会 (KT) (Lietuvos Respublikos konkurencijos taryba)](https://kt.gov.lt/) [投诉入口](https://kt.gov.lt/lt/formos/pranesimas-apie-karteli/)"
16861692
- id: slovakia
16871693
name:
16881694
ar: "سلوفاكيا"
@@ -1718,13 +1724,16 @@ countries:
17181724
name:
17191725
en: "Hungary"
17201726
hu: "Magyarország"
1727+
zh-CN: "匈牙利"
17211728
items:
17221729
- text:
17231730
en: "E-mail: [ugyfelszolgalat@gvh.hu](mailto:ugyfelszolgalat@gvh.hu?cc=hungary@keepandroidopen.org)"
17241731
hu: "E-mail: [ugyfelszolgalat@gvh.hu](mailto:ugyfelszolgalat@gvh.hu?cc=hungary@keepandroidopen.org)"
1732+
zh-CN: "电子邮件:[ugyfelszolgalat@gvh.hu](mailto:ugyfelszolgalat@gvh.hu?cc=hungary@keepandroidopen.org)"
17251733
- text:
17261734
en: "Contact the [Hungarian Competition Authority (Gazdasági Versenyhivatal)](https://www.gvh.hu/en/gvh/2361_en_contact_us)"
17271735
hu: "Vedd fel a kapcsolatot a [Gazdasági Versenyhivatallal](https://www.gvh.hu/gvh/2361_hu_elerhetosegek_kapcsolatok)"
1736+
zh-CN: "联系[匈牙利竞争管理局 (Gazdasági Versenyhivatal)](https://www.gvh.hu/en/gvh/2361_en_contact_us)"
17281737
- id: united-kingdom
17291738
name:
17301739
fa: "بریتانیای کبیر"
@@ -2314,21 +2323,29 @@ countries:
23142323
- id: new-zealand
23152324
name:
23162325
en: "Aotearoa / New Zealand"
2326+
zh-CN: "奥特亚罗瓦/新西兰"
23172327
items:
23182328
- text:
23192329
en: "Email: [contact@comcom.govt.nz](mailto:contact@comcom.govt.nz?cc=nz@keepandroidopen.org)"
2330+
zh-CN: "电子邮件:[contact@comcom.govt.nz](mailto:contact@comcom.govt.nz?cc=nz@keepandroidopen.org)"
23202331
- text:
23212332
en: "Phone: [0800 943 600](tel:08009436000)"
2333+
zh-CN: "电话:[0800 943 600](tel:08009436000)"
23222334
- text:
23232335
en: "Report anti-competitive conduct to the [Commerce Commission](https://www.comcom.govt.nz/report-a-concern/)"
2336+
zh-CN: "向 [商务委员会](https://www.comcom.govt.nz/report-a-concern/) 举报反竞争行为"
23242337
- text:
23252338
en: "Contact the Minister of Commerce and Consumer Affairs, Hon Scott Simpson: [scott.simpson@parliament.govt.nz](mailto:scott.simpson@parliament.govt.nz)"
2339+
zh-CN: "联系商务与消费者事务部部长,斯科特·辛普森阁下:[scott.simpson@parliament.govt.nz](mailto:scott.simpson@parliament.govt.nz)"
23262340
- text:
23272341
en: "Contact your local Member of Parliament. If you don't know your electorate, find it at [vote.nz](https://www.vote.nz)"
2342+
zh-CN: "联系您当地的议员。如果您不知道您的选区,可在[vote.nz](https://www.vote.nz)查找"
23282343
- text:
23292344
en: "Contact [InternetNZ](https://internetnz.nz) — the non-profit advocate for an open internet in Aotearoa: [office@internetnz.net.nz](mailto:office@internetnz.net.nz)"
2345+
zh-CN: "联系[InternetNZ](https://internetnz.nz) — 新西兰开放互联网的非盈利倡导者:[office@internetnz.net.nz](mailto:office@internetnz.net.nz)"
23302346
- text:
23312347
en: "Contact [Consumer NZ](https://www.consumer.org.nz/about/contact-us) — Aotearoa's independent consumer advocacy organisation. Ask them to lodge a formal complaint to the Commerce Commission on behalf of consumers."
2348+
zh-CN: "联系[Consumer NZ](https://www.consumer.org.nz/about/contact-us) — 新西兰独立的消费者权益组织。要求他们代表消费者向商务委员会提出正式投诉。"
23322349
- id: japan
23332350
name:
23342351
fa: "ژاپن"
@@ -3188,13 +3205,16 @@ countries:
31883205
- text:
31893206
en: "Contact the [Hungarian Competition Authority (Gazdasági Versenyhivatal)](https://www.gvh.hu/en/gvh/2361_en_contact_us)"
31903207
hu: "Vedd fel a kapcsolatot a [Gazdasági Versenyhivatallal](https://www.gvh.hu/gvh/2361_hu_elerhetosegek_kapcsolatok)"
3208+
zh-CN: "联系[匈牙利竞争管理局 (Gazdasági Versenyhivatal)](https://www.gvh.hu/en/gvh/2361_en_contact_us)"
31913209
- id: colombia
31923210
name:
31933211
en: "Colombia"
31943212
es: "Colombia"
31953213
pt-BR: "Colômbia"
3214+
zh-CN: "哥伦比亚"
31963215
items:
31973216
- text:
31983217
en: Make a report to the [Superintendence of Industry and Commerce](https://servicioslinea.sic.gov.co/servilinea/pqrsf/)
31993218
es: Presentar una denuncia ante la [Superintendencia de Industria y Comercio](https://servicioslinea.sic.gov.co/servilinea/pqrsf/)
32003219
pt-BR: Faça um relato para a [Superintendência de Indústria e Comércio](https://servicioslinea.sic.gov.co/servilinea/pqrsf/)
3220+
zh-CN: 向[工商业监管局](https://servicioslinea.sic.gov.co/servilinea/pqrsf/)报告

0 commit comments

Comments
 (0)