Skip to content

Commit

Permalink
Merge branch 'trunk' into mokagio/remove-pods-check-header
Browse files Browse the repository at this point in the history
  • Loading branch information
mokagio authored Oct 29, 2024
2 parents bdc664e + 43c8087 commit 227c949
Show file tree
Hide file tree
Showing 55 changed files with 425 additions and 248 deletions.
19 changes: 19 additions & 0 deletions .buildkite/commands/configure-for-release.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/bash

if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
echo "This script must be 'source'd (instead of being called directly as an executable) to work properly"
exit 1
fi

# Note: Set the flags separately (instead of via the shebang), because that script will be `source`'d and not run directly
set -e
set -u

# The Git command line client is not configured in Buildkite.
# At the moment, steps that need Git access can configure it on demand using this script.
# Later on, we should be able to configure it on the agent instead.
git config --global user.email "[email protected]"
git config --global user.name "Automattic Release Bot"

echo '--- :robot_face: Use bot for git operations'
source use-bot-for-git
8 changes: 0 additions & 8 deletions .buildkite/commands/configure-git-for-release-management.sh

This file was deleted.

2 changes: 1 addition & 1 deletion .buildkite/release-pipelines/complete-code-freeze.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ steps:
plugins: [$CI_TOOLKIT_PLUGIN]
command: |
echo '--- :git: Configure Git for Release Management'
.buildkite/commands/configure-git-for-release-management.sh
source .buildkite/commands/configure-for-release.sh
echo '--- :git: Checkout release branch'
.buildkite/commands/checkout-release-branch.sh
Expand Down
10 changes: 6 additions & 4 deletions .buildkite/release-pipelines/new-beta-release.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
---

agents:
queue: mac
# Variables used in this pipeline are defined in `shared-pipeline-vars`, which is `source`'d before calling `buildkite-agent pipeline upload`

# The new beta workflow needs to run on macOS because it uses SwiftGen under the hood.
#
Expand All @@ -11,12 +10,15 @@ agents:
env:
IMAGE_ID: $IMAGE_ID

agents:
queue: mac

steps:
- label: New Beta Release
plugins: [$CI_TOOLKIT]
plugins: [$CI_TOOLKIT_PLUGIN]
command: |
echo '--- :git: Configure Git for Release Management'
.buildkite/commands/configure-git-for-release-management.sh
source .buildkite/commands/configure-for-release.sh
echo '--- :git: Checkout Release Branch'
.buildkite/commands/checkout-release-branch.sh
Expand Down
12 changes: 8 additions & 4 deletions .buildkite/release-pipelines/start-code-freeze.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,19 @@

# Variables used in this pipeline are defined in `shared-pipeline-vars`, which is `source`'d before calling `buildkite-agent pipeline upload`

env:
IMAGE_ID: $IMAGE_ID

agents:
queue: mac

steps:
- label: Start Code Freeze
plugins:
- $CI_TOOLKIT_PLUGIN
agents:
queue: tumblr-metal
command: |
echo '--- :robot_face: Use bot for Git operations'
source use-bot-for-git wpmobilebot
echo '--- :git: Configure Git for Release Management'
source .buildkite/commands/configure-for-release.sh
echo '--- :ruby: Setup Ruby Tools'
install_gems
Expand Down
2 changes: 1 addition & 1 deletion .xcode-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
15.4
16.1-rc.1
8 changes: 7 additions & 1 deletion Simplenote/ar.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Translation-Revision-Date: 2024-09-12 11:54:02+0000 */
/* Translation-Revision-Date: 2024-09-19 12:54:03+0000 */
/* Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5; */
/* Generator: GlotPress/2.4.0-alpha */
/* Language: ar */
Expand Down Expand Up @@ -987,6 +987,9 @@
/* Visit app.simplenote.com in the browser */
"Visit Web App" = "زيارة تطبيق الويب";

/* Option to login with username and password *PREFIX*: printed in dark color */
"We'll email you a code to log in, or you can" = "سنرسل إليك كودًا بالبريد لتسجيل الدخول، أو يمكنك";

/* Generic error */
"We're having problems. Please try again soon." = "لدينا مشكلات. يُرجى المحاولة مرة أخرى لاحقًا.";

Expand Down Expand Up @@ -1042,6 +1045,9 @@
/* Message shown in note list when no notes are in the trash */
"Your trash is empty" = "سلة المهملات لديك فارغة";

/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
"log in manually." = "التسجيل يدويًا.";

/* Search Operator for tags. Please preserve the semicolons when translating! */
"tag:" = "وسم:";

Expand Down
8 changes: 7 additions & 1 deletion Simplenote/de.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Translation-Revision-Date: 2024-09-11 12:54:02+0000 */
/* Translation-Revision-Date: 2024-09-19 12:54:03+0000 */
/* Plural-Forms: nplurals=2; plural=n != 1; */
/* Generator: GlotPress/2.4.0-alpha */
/* Language: de */
Expand Down Expand Up @@ -987,6 +987,9 @@
/* Visit app.simplenote.com in the browser */
"Visit Web App" = "Web-App aufrufen";

/* Option to login with username and password *PREFIX*: printed in dark color */
"We'll email you a code to log in, or you can" = "Wir senden dir eine E-Mail mit einem Code zur Anmeldung.";

/* Generic error */
"We're having problems. Please try again soon." = "Momentan gibt es ein paar Probleme. Bitte versuche es später erneut.";

Expand Down Expand Up @@ -1042,6 +1045,9 @@
/* Message shown in note list when no notes are in the trash */
"Your trash is empty" = "Der Papierkorb ist leer";

/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
"log in manually." = "Alternativ kannst du dich manuell anmelden.";

/* Search Operator for tags. Please preserve the semicolons when translating! */
"tag:" = "Schlagwort:";

Expand Down
8 changes: 7 additions & 1 deletion Simplenote/es.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Translation-Revision-Date: 2024-09-11 16:54:02+0000 */
/* Translation-Revision-Date: 2024-09-18 16:54:03+0000 */
/* Plural-Forms: nplurals=2; plural=n != 1; */
/* Generator: GlotPress/2.4.0-alpha */
/* Language: es */
Expand Down Expand Up @@ -987,6 +987,9 @@
/* Visit app.simplenote.com in the browser */
"Visit Web App" = "Visitar aplicación web";

/* Option to login with username and password *PREFIX*: printed in dark color */
"We'll email you a code to log in, or you can" = "Te enviaremos por correo electrónico un código para iniciar sesión; también puedes";

/* Generic error */
"We're having problems. Please try again soon." = "Estamos teniendo algunos problemas. Inténtalo de nuevo pronto.";

Expand Down Expand Up @@ -1042,6 +1045,9 @@
/* Message shown in note list when no notes are in the trash */
"Your trash is empty" = "La papelera está vacía";

/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
"log in manually." = "hacerlo manualmente.";

/* Search Operator for tags. Please preserve the semicolons when translating! */
"tag:" = "etiqueta:";

Expand Down
8 changes: 7 additions & 1 deletion Simplenote/fr.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Translation-Revision-Date: 2024-09-12 09:54:03+0000 */
/* Translation-Revision-Date: 2024-09-19 12:54:03+0000 */
/* Plural-Forms: nplurals=2; plural=n > 1; */
/* Generator: GlotPress/2.4.0-alpha */
/* Language: fr */
Expand Down Expand Up @@ -987,6 +987,9 @@
/* Visit app.simplenote.com in the browser */
"Visit Web App" = "Visiter l'application Web";

/* Option to login with username and password *PREFIX*: printed in dark color */
"We'll email you a code to log in, or you can" = "Nous vous enverrons par e-mail un code pour vous connecter, ou vous pouvez";

/* Generic error */
"We're having problems. Please try again soon." = "Nous rencontrons des problèmes. Veuillez réessayer dans quelques instants.";

Expand Down Expand Up @@ -1042,6 +1045,9 @@
/* Message shown in note list when no notes are in the trash */
"Your trash is empty" = "Votre corbeille est vide";

/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
"log in manually." = "vous connecter manuellement.";

/* Search Operator for tags. Please preserve the semicolons when translating! */
"tag:" = "étiquette :";

Expand Down
8 changes: 7 additions & 1 deletion Simplenote/he.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Translation-Revision-Date: 2024-09-11 16:54:02+0000 */
/* Translation-Revision-Date: 2024-09-19 14:54:02+0000 */
/* Plural-Forms: nplurals=2; plural=n != 1; */
/* Generator: GlotPress/2.4.0-alpha */
/* Language: he_IL */
Expand Down Expand Up @@ -987,6 +987,9 @@
/* Visit app.simplenote.com in the browser */
"Visit Web App" = "מעבר לאפליקציית הרשת";

/* Option to login with username and password *PREFIX*: printed in dark color */
"We'll email you a code to log in, or you can" = "אנחנו נשלח לך אימייל עם הקוד להתחברות, או שאפשר";

/* Generic error */
"We're having problems. Please try again soon." = "נתקלנו בבעיות. יש לנסות שוב בקרוב.";

Expand Down Expand Up @@ -1042,6 +1045,9 @@
/* Message shown in note list when no notes are in the trash */
"Your trash is empty" = "הפח שלך ריק";

/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
"log in manually." = "להתחבר באופן ידני.";

/* Search Operator for tags. Please preserve the semicolons when translating! */
"tag:" = "תגית:";

Expand Down
8 changes: 7 additions & 1 deletion Simplenote/id.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Translation-Revision-Date: 2024-09-12 09:54:03+0000 */
/* Translation-Revision-Date: 2024-09-19 09:54:03+0000 */
/* Plural-Forms: nplurals=2; plural=n > 1; */
/* Generator: GlotPress/2.4.0-alpha */
/* Language: id */
Expand Down Expand Up @@ -984,6 +984,9 @@
/* Visit app.simplenote.com in the browser */
"Visit Web App" = "Kunjungi Aplikasi Web";

/* Option to login with username and password *PREFIX*: printed in dark color */
"We'll email you a code to log in, or you can" = "Kami akan mengirimkan email berisi kode untuk login atau Anda dapat";

/* Generic error */
"We're having problems. Please try again soon." = "Kami mengalami masalah. Harap coba lagi nanti.";

Expand Down Expand Up @@ -1039,6 +1042,9 @@
/* Message shown in note list when no notes are in the trash */
"Your trash is empty" = "Sampah Anda kosong";

/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
"log in manually." = "login secara manual";

/* Search Operator for tags. Please preserve the semicolons when translating! */
"tag:" = "tag:";

Expand Down
8 changes: 7 additions & 1 deletion Simplenote/it.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Translation-Revision-Date: 2024-09-12 11:54:03+0000 */
/* Translation-Revision-Date: 2024-09-18 20:54:02+0000 */
/* Plural-Forms: nplurals=2; plural=n != 1; */
/* Generator: GlotPress/2.4.0-alpha */
/* Language: it */
Expand Down Expand Up @@ -987,6 +987,9 @@
/* Visit app.simplenote.com in the browser */
"Visit Web App" = "Visita l'app web";

/* Option to login with username and password *PREFIX*: printed in dark color */
"We'll email you a code to log in, or you can" = "Ti invieremo un codice per l'accesso, oppure puoi";

/* Generic error */
"We're having problems. Please try again soon." = "Stiamo riscontrando dei problemi. Riprova a breve.";

Expand Down Expand Up @@ -1042,6 +1045,9 @@
/* Message shown in note list when no notes are in the trash */
"Your trash is empty" = "Il tuo cestino è vuoto";

/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
"log in manually." = "accedere manualmente.";

/* Search Operator for tags. Please preserve the semicolons when translating! */
"tag:" = "- Tag:";

Expand Down
8 changes: 7 additions & 1 deletion Simplenote/ja.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Translation-Revision-Date: 2024-09-12 09:54:03+0000 */
/* Translation-Revision-Date: 2024-09-19 09:54:03+0000 */
/* Plural-Forms: nplurals=1; plural=0; */
/* Generator: GlotPress/2.4.0-alpha */
/* Language: ja_JP */
Expand Down Expand Up @@ -987,6 +987,9 @@
/* Visit app.simplenote.com in the browser */
"Visit Web App" = "Web アプリにアクセス";

/* Option to login with username and password *PREFIX*: printed in dark color */
"We'll email you a code to log in, or you can" = "ログインするためのコードをメールでお送りします。または、";

/* Generic error */
"We're having problems. Please try again soon." = "問題が発生しました。すぐにもう一度実行してください。";

Expand Down Expand Up @@ -1042,6 +1045,9 @@
/* Message shown in note list when no notes are in the trash */
"Your trash is empty" = "ゴミ箱は空です";

/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
"log in manually." = "手動でログインすることもできます。";

/* Search Operator for tags. Please preserve the semicolons when translating! */
"tag:" = "タグ :";

Expand Down
8 changes: 7 additions & 1 deletion Simplenote/ko.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Translation-Revision-Date: 2024-09-12 09:54:03+0000 */
/* Translation-Revision-Date: 2024-09-20 09:54:08+0000 */
/* Plural-Forms: nplurals=1; plural=0; */
/* Generator: GlotPress/2.4.0-alpha */
/* Language: ko_KR */
Expand Down Expand Up @@ -987,6 +987,9 @@
/* Visit app.simplenote.com in the browser */
"Visit Web App" = "웹 앱 방문";

/* Option to login with username and password *PREFIX*: printed in dark color */
"We'll email you a code to log in, or you can" = "이메일을 통해 받으신 코드로 로그인할 수 있으며";

/* Generic error */
"We're having problems. Please try again soon." = "문제가 있습니다. 나중에 다시 시도하세요.";

Expand Down Expand Up @@ -1042,6 +1045,9 @@
/* Message shown in note list when no notes are in the trash */
"Your trash is empty" = "휴지통이 비어 있습니다.";

/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
"log in manually." = "직접 로그인하셔도 됩니다.";

/* Search Operator for tags. Please preserve the semicolons when translating! */
"tag:" = "태그:";

Expand Down
10 changes: 8 additions & 2 deletions Simplenote/nl.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Translation-Revision-Date: 2024-09-12 15:54:02+0000 */
/* Translation-Revision-Date: 2024-09-20 09:54:07+0000 */
/* Plural-Forms: nplurals=2; plural=n != 1; */
/* Generator: GlotPress/2.4.0-alpha */
/* Language: nl */
Expand Down Expand Up @@ -227,7 +227,7 @@
"Could not create an account with the provided email address and password." = "Kan geen account maken met het opgegeven e-mailadres en wachtwoord.";

/* Notifies user tag delete failed */
"Could not delete tag" = "Kon de tag niet verwijderen";
"Could not delete tag" = "Kon tag niet verwijderen";

/* Note fetch error title */
"Could not fetch Notes" = "Het is niet gelukt om notities op te halen";
Expand Down Expand Up @@ -987,6 +987,9 @@
/* Visit app.simplenote.com in the browser */
"Visit Web App" = "Web-app bezoeken";

/* Option to login with username and password *PREFIX*: printed in dark color */
"We'll email you a code to log in, or you can" = "We sturen je via e-mail een code die je kan gebruiken om in te loggen, of je kan";

/* Generic error */
"We're having problems. Please try again soon." = "We ondervinden wat problemen. Probeer het later opnieuw.";

Expand Down Expand Up @@ -1042,6 +1045,9 @@
/* Message shown in note list when no notes are in the trash */
"Your trash is empty" = "Je prullenbak is leeg";

/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
"log in manually." = "handmatig inloggen.";

/* Search Operator for tags. Please preserve the semicolons when translating! */
"tag:" = "tag:";

Expand Down
8 changes: 7 additions & 1 deletion Simplenote/pt-BR.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Translation-Revision-Date: 2024-09-11 14:54:03+0000 */
/* Translation-Revision-Date: 2024-09-18 16:54:03+0000 */
/* Plural-Forms: nplurals=2; plural=(n > 1); */
/* Generator: GlotPress/2.4.0-alpha */
/* Language: pt_BR */
Expand Down Expand Up @@ -987,6 +987,9 @@
/* Visit app.simplenote.com in the browser */
"Visit Web App" = "Acessar o aplicativo para Web";

/* Option to login with username and password *PREFIX*: printed in dark color */
"We'll email you a code to log in, or you can" = "Enviaremos o código de login por e-mail. Se preferir,";

/* Generic error */
"We're having problems. Please try again soon." = "Estamos com problemas. Tente novamente mais tarde.";

Expand Down Expand Up @@ -1042,6 +1045,9 @@
/* Message shown in note list when no notes are in the trash */
"Your trash is empty" = "Sua lixeira está vazia";

/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
"log in manually." = "faça login manualmente.";

/* Search Operator for tags. Please preserve the semicolons when translating! */
"tag:" = "tag:";

Expand Down
Loading

0 comments on commit 227c949

Please sign in to comment.