Skip to content

Commit ae634b1

Browse files
authored
Merge branch 'main' into fix-semantics-accessibility
2 parents 0920772 + fa947a1 commit ae634b1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+2208
-367
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,20 @@ name: CI
22

33
on: [push, pull_request]
44

5+
permissions:
6+
contents: read
7+
58
jobs:
69
check:
710
runs-on: ubuntu-24.04
811
steps:
9-
- uses: actions/checkout@v4.1.7
12+
- uses: actions/checkout@v6
1013

1114
- name: Install system dependencies
1215
run: TERM=dumb sudo apt install libsqlite3-dev -y
1316

1417
- name: Set up JDK
15-
uses: actions/setup-java@v4.2.1
18+
uses: actions/setup-java@v5
1619
with:
1720
java-version: 17
1821
distribution: temurin

.github/workflows/update-translations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
env:
1919
WEBLATE_API_KEY: ${{ secrets.WEBLATE_API_KEY }}
2020

21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v6
2222
with:
2323
# Enough such that even a still-out-of-date weblate will have shared history
2424
fetch-depth: 50

android/app/src/main/kotlin/com/zulip/flutter/AndroidIntents.g.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Autogenerated from Pigeon (v26.1.1), do not edit directly.
1+
// Autogenerated from Pigeon (v26.1.2), do not edit directly.
22
// See also: https://pub.dev/packages/pigeon
33
@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
44

android/app/src/main/kotlin/com/zulip/flutter/AndroidNotifications.g.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Autogenerated from Pigeon (v26.1.1), do not edit directly.
1+
// Autogenerated from Pigeon (v26.1.2), do not edit directly.
22
// See also: https://pub.dev/packages/pigeon
33
@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
44

assets/l10n/app_ar.arb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"@settingsPageTitle": {
1818
"description": "Title for the settings page."
1919
},
20-
"@switchAccountButton": {
21-
"description": "Label for main-menu button leading to the choose-account page."
20+
"@switchAccountButtonTooltip": {
21+
"description": "Tooltip message for main-menu button leading to the choose-account page."
2222
},
2323
"@upgradeWelcomeDialogDismiss": {
2424
"description": "Label for button dismissing dialog shown on first upgrade from the legacy Zulip app."
@@ -41,7 +41,7 @@
4141
"aboutPageTitle": "عن زوليب",
4242
"chooseAccountPageTitle": "اختر حساب",
4343
"settingsPageTitle": "الإعدادات",
44-
"switchAccountButton": "تبديل الحساب",
44+
"switchAccountButtonTooltip": "تبديل الحساب",
4545
"upgradeWelcomeDialogDismiss": "هيا بنا",
4646
"upgradeWelcomeDialogTitle": "أهلا بك في تطبيق زوليب الجديد !",
4747
"wildcardMentionAll": "الجميع",

assets/l10n/app_de.arb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,8 +1015,8 @@
10151015
"@successTopicLinkCopied": {
10161016
"description": "Message when link of a topic was copied to the user's system clipboard."
10171017
},
1018-
"@switchAccountButton": {
1019-
"description": "Label for main-menu button leading to the choose-account page."
1018+
"@switchAccountButtonTooltip": {
1019+
"description": "Tooltip message for main-menu button leading to the choose-account page."
10201020
},
10211021
"@themeSettingDark": {
10221022
"description": "Label for dark theme setting."
@@ -1485,7 +1485,7 @@
14851485
"successMessageLinkCopied": "Nachrichtenlink kopiert",
14861486
"successMessageTextCopied": "Nachrichtentext kopiert",
14871487
"successTopicLinkCopied": "Link zum Thema kopiert",
1488-
"switchAccountButton": "Konto wechseln",
1488+
"switchAccountButtonTooltip": "Konto wechseln",
14891489
"themeSettingDark": "Dunkel",
14901490
"themeSettingLight": "Hell",
14911491
"themeSettingSystem": "System",

assets/l10n/app_en.arb

Lines changed: 72 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
"@settingsPageTitle": {
4040
"description": "Title for the settings page."
4141
},
42-
"switchAccountButton": "Switch account",
43-
"@switchAccountButton": {
44-
"description": "Label for main-menu button leading to the choose-account page."
42+
"switchAccountButtonTooltip": "Switch account",
43+
"@switchAccountButtonTooltip": {
44+
"description": "Tooltip message for main-menu button leading to the choose-account page."
4545
},
4646
"tryAnotherAccountMessage": "Your account at {url} is taking a while to load.",
4747
"@tryAnotherAccountMessage": {
@@ -687,6 +687,75 @@
687687
"@emptyMessageList": {
688688
"description": "Placeholder for some message-list pages when there are no messages."
689689
},
690+
"emptyMessageListCombinedFeed": "There are no messages in your combined feed.",
691+
"@emptyMessageListCombinedFeed": {
692+
"description": "Placeholder for the 'Combined feed' page when there are no messages."
693+
},
694+
"emptyMessageListChannelWithoutContentAccess": "You don’t have <z-link>content access</z-link> to this channel.",
695+
"@emptyMessageListChannelWithoutContentAccess": {
696+
"description": "Placeholder for a channel or topic page when there are no messages and you don’t have content access."
697+
},
698+
"emptyMessageListChannelUnavailable": "This channel doesn’t exist, or you are not allowed to view it.",
699+
"@emptyMessageListChannelUnavailable": {
700+
"description": "Placeholder for a channel page when there are no messages and the channel does not exist or you don't have access to it."
701+
},
702+
"emptyMessageListSelfDmHeader": "You have not sent any direct messages to yourself yet!",
703+
"@emptyMessageListSelfDmHeader": {
704+
"description": "Placeholder for the self-DM page when there are no messages."
705+
},
706+
"emptyMessageListSelfDmMessage": "Use this space for personal notes, or to test out Zulip features.",
707+
"@emptyMessageListSelfDmMessage": {
708+
"description": "Extra detail in the placeholder for the self-DM page when there are no messages."
709+
},
710+
"emptyMessageListDm": "You have no direct messages with {person} yet.",
711+
"@emptyMessageListDm": {
712+
"description": "Placeholder for a 1:1 DM page when there are no messages.",
713+
"placeholders": {
714+
"person": {"type": "String", "example": "Alice"}
715+
}
716+
},
717+
"emptyMessageListDmDeactivatedUser": "You have no direct messages with {person}.",
718+
"@emptyMessageListDmDeactivatedUser": {
719+
"description": "Placeholder for a 1:1 DM page when there are no messages and the other user is deactivated.",
720+
"placeholders": {
721+
"person": {"type": "String", "example": "Alice"}
722+
}
723+
},
724+
"emptyMessageListDmUnknownUser": "You have no direct messages with this user.",
725+
"@emptyMessageListDmUnknownUser": {
726+
"description": "Placeholder for a 1:1 DM page when there are no messages and the other user's name is unavailable."
727+
},
728+
"emptyMessageListGroupDm": "You have no direct messages with these users yet.",
729+
"@emptyMessageListGroupDm": {
730+
"description": "Placeholder for a group DM page when there are no messages."
731+
},
732+
"emptyMessageListGroupDmDeactivatedUser": "You have no direct messages with these users.",
733+
"@emptyMessageListGroupDmDeactivatedUser": {
734+
"description": "Placeholder for a group DM page when there are no messages and one or more participants is deactivated."
735+
},
736+
"emptyMessageListDmStartConversation": "Why not start the conversation?",
737+
"@emptyMessageListDmStartConversation": {
738+
"description": "Extra detail in the placeholder for some DM pages when there are no messages."
739+
},
740+
"emptyMessageListMentionsHeader": "This view will show messages where you are <z-link>mentioned</z-link>.",
741+
"@emptyMessageListMentionsHeader": {
742+
"description": "Placeholder for the 'Mentions' page when there are no messages."
743+
},
744+
"emptyMessageListMentionsMessage": "To call attention to a message, you can mention a user, a group, topic participants, or all subscribers to a channel. Type @ in the compose box, and choose who you’d like to mention from the list of suggestions.",
745+
"@emptyMessageListMentionsMessage": {
746+
"description": "Extra detail in the placeholder for the 'Mentions' page when there are no messages."
747+
},
748+
"emptyMessageListStarredHeader": "You have no starred messages.",
749+
"@emptyMessageListStarredHeader": {
750+
"description": "Placeholder for the 'Starred' page when there are no messages."
751+
},
752+
"emptyMessageListStarredMessage": "<z-link>Starring</z-link> is a good way to keep track of important messages, such as tasks you need to go back to, or useful references. To star a message, long-press it and tap “{button}.”",
753+
"@emptyMessageListStarredMessage": {
754+
"description": "Extra detail in the placeholder for the 'Starred' page when there are no messages. The {button} placeholder will be the button's translated text.",
755+
"placeholders": {
756+
"button": {"type": "String", "example": "Star message"}
757+
}
758+
},
690759
"emptyMessageListSearch": "No search results.",
691760
"@emptyMessageListSearch": {
692761
"description": "Placeholder for the 'Search' page when there are no messages."

assets/l10n/app_fr.arb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -526,8 +526,8 @@
526526
"@successTopicLinkCopied": {
527527
"description": "Message when link of a topic was copied to the user's system clipboard."
528528
},
529-
"@switchAccountButton": {
530-
"description": "Label for main-menu button leading to the choose-account page."
529+
"@switchAccountButtonTooltip": {
530+
"description": "Tooltip message for main-menu button leading to the choose-account page."
531531
},
532532
"@topicsButtonTooltip": {
533533
"description": "Tooltip for button to navigate to topic-list page."
@@ -742,7 +742,7 @@
742742
"successMessageLinkCopied": "Lien sur le message copié",
743743
"successMessageTextCopied": "Texte du message copié",
744744
"successTopicLinkCopied": "Lien sur le sujet copié",
745-
"switchAccountButton": "Changer de compte",
745+
"switchAccountButtonTooltip": "Changer de compte",
746746
"topicsButtonTooltip": "Sujets",
747747
"tryAnotherAccountButton": "Essayer un autre compte",
748748
"tryAnotherAccountMessage": "Votre compte à {url} prend du temps à se charger.",

assets/l10n/app_it.arb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -841,8 +841,8 @@
841841
"@successMessageTextCopied": {
842842
"description": "Message when content of a message was copied to the user's system clipboard."
843843
},
844-
"@switchAccountButton": {
845-
"description": "Label for main-menu button leading to the choose-account page."
844+
"@switchAccountButtonTooltip": {
845+
"description": "Tooltip message for main-menu button leading to the choose-account page."
846846
},
847847
"@themeSettingDark": {
848848
"description": "Label for dark theme setting."
@@ -1173,7 +1173,7 @@
11731173
"successLinkCopied": "Collegamento copiato",
11741174
"successMessageLinkCopied": "Collegamento messaggio copiato",
11751175
"successMessageTextCopied": "Testo messaggio copiato",
1176-
"switchAccountButton": "Cambia account",
1176+
"switchAccountButtonTooltip": "Cambia account",
11771177
"themeSettingDark": "Scuro",
11781178
"themeSettingLight": "Chiaro",
11791179
"themeSettingSystem": "Sistema",

assets/l10n/app_ja.arb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -979,8 +979,8 @@
979979
"@successTopicLinkCopied": {
980980
"description": "Message when link of a topic was copied to the user's system clipboard."
981981
},
982-
"@switchAccountButton": {
983-
"description": "Label for main-menu button leading to the choose-account page."
982+
"@switchAccountButtonTooltip": {
983+
"description": "Tooltip message for main-menu button leading to the choose-account page."
984984
},
985985
"@themeSettingDark": {
986986
"description": "Label for dark theme setting."
@@ -1424,7 +1424,7 @@
14241424
"successMessageLinkCopied": "メッセージのリンクをコピーしました",
14251425
"successMessageTextCopied": "メッセージ本文をコピーしました",
14261426
"successTopicLinkCopied": "トピックのリンクをコピーしました",
1427-
"switchAccountButton": "アカウントを切り替える",
1427+
"switchAccountButtonTooltip": "アカウントを切り替える",
14281428
"themeSettingDark": "ダークテーマ",
14291429
"themeSettingLight": "ライトテーマ",
14301430
"themeSettingSystem": "自動テーマ",

0 commit comments

Comments
 (0)