Skip to content

Commit 33cfe1c

Browse files
Merge branch 'zulip:main' into katex-2
2 parents 7bb4c7b + 1699aa5 commit 33cfe1c

File tree

93 files changed

+7370
-1105
lines changed

Some content is hidden

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

93 files changed

+7370
-1105
lines changed

android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ android {
3535

3636
defaultConfig {
3737
applicationId "com.zulipmobile"
38-
minSdkVersion 28
38+
minSdkVersion 26
3939
targetSdkVersion flutter.targetSdkVersion
4040
// These are synced to local.properties from pubspec.yaml by the flutter tool.
4141
versionCode localProperties.getProperty('flutter.versionCode').toInteger()

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.0.1), do not edit directly.
1+
// Autogenerated from Pigeon (v26.0.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.0.1), do not edit directly.
1+
// Autogenerated from Pigeon (v26.0.2), do not edit directly.
22
// See also: https://pub.dev/packages/pigeon
33
@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
44

assets/l10n/app_de.arb

Lines changed: 58 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
"@actionSheetOptionCopyTopicLink": {
2727
"description": "Label for copy topic link button in action sheet."
2828
},
29+
"@actionSheetOptionDeleteMessage": {
30+
"description": "Label for the 'Delete message' button in the message action sheet."
31+
},
2932
"@actionSheetOptionEditMessage": {
3033
"description": "Label for the 'Edit message' button in the message action sheet."
3134
},
@@ -104,6 +107,12 @@
104107
"@actionSheetReadReceiptsZeroReadCount": {
105108
"description": "Label in the \"Read receipts\" bottom sheet when no one has read the message."
106109
},
110+
"@allChannelsEmptyPlaceholder": {
111+
"description": "Centered text on the 'All channels' page saying that there is no content to show."
112+
},
113+
"@allChannelsPageTitle": {
114+
"description": "Title for the 'All channels' page."
115+
},
107116
"@appVersionUnknownPlaceholder": {
108117
"description": "Placeholder to show in place of the app version when it is unknown."
109118
},
@@ -113,6 +122,15 @@
113122
"@channelsEmptyPlaceholder": {
114123
"description": "Centered text on the 'Channels' page saying that there is no content to show."
115124
},
125+
"@channelsEmptyPlaceholderWithAllChannelsLink": {
126+
"description": "Centered text on the 'Channels' page saying that there is no content to show, with a link to 'All channels'.",
127+
"placeholders": {
128+
"allChannelsPageTitle": {
129+
"example": "All channels",
130+
"type": "String"
131+
}
132+
}
133+
},
116134
"@channelsPageTitle": {
117135
"description": "Title for the page with a list of subscribed channels."
118136
},
@@ -140,12 +158,21 @@
140158
"@composeBoxBannerButtonCancel": {
141159
"description": "Label text for the 'Cancel' button in the compose-box banner when you are editing a message."
142160
},
161+
"@composeBoxBannerButtonRefresh": {
162+
"description": "Label text for the 'Refresh' button in the compose-box banner when you are viewing an unsubscribed channel."
163+
},
143164
"@composeBoxBannerButtonSave": {
144165
"description": "Label text for the 'Save' button in the compose-box banner when you are editing a message."
145166
},
167+
"@composeBoxBannerButtonSubscribe": {
168+
"description": "Label text for the 'Subscribe' button in the compose-box banner when you are viewing an unsubscribed channel."
169+
},
146170
"@composeBoxBannerLabelEditMessage": {
147171
"description": "Label text for the compose-box banner when you are editing a message."
148172
},
173+
"@composeBoxBannerLabelUnsubscribedWhenCannotSend": {
174+
"description": "Label text for a compose-box banner when you are viewing an unsubscribed channel in which you do not have permission to send messages."
175+
},
149176
"@composeBoxChannelContentHint": {
150177
"description": "Hint text for content input when sending a message to a channel.",
151178
"placeholders": {
@@ -218,6 +245,15 @@
218245
"@contentValidationErrorUploadInProgress": {
219246
"description": "Content validation error message when attachments have not finished uploading."
220247
},
248+
"@deleteMessageConfirmationDialogConfirmButton": {
249+
"description": "Label for the 'Delete' button on a confirmation dialog for deleting a message."
250+
},
251+
"@deleteMessageConfirmationDialogMessage": {
252+
"description": "Message for a confirmation dialog for deleting a message."
253+
},
254+
"@deleteMessageConfirmationDialogTitle": {
255+
"description": "Title for a confirmation dialog for deleting a message."
256+
},
221257
"@dialogCancel": {
222258
"description": "Button label in dialogs to cancel."
223259
},
@@ -340,6 +376,9 @@
340376
"@errorCouldNotShowUserProfile": {
341377
"description": "Message that appears on the user profile page when the profile cannot be shown."
342378
},
379+
"@errorDeleteMessageFailedTitle": {
380+
"description": "Error title when deleting a message failed."
381+
},
343382
"@errorDialogContinue": {
344383
"description": "Button label in error dialogs to acknowledge the error and close the dialog."
345384
},
@@ -738,6 +777,9 @@
738777
"@mutedUser": {
739778
"description": "Name for a muted user to display all over the app."
740779
},
780+
"@navButtonAllChannels": {
781+
"description": "Title for a nav button that opens the 'All channels' page."
782+
},
741783
"@newDmFabButtonLabel": {
742784
"description": "Label for the floating action button (FAB) that opens the new DM sheet."
743785
},
@@ -1062,8 +1104,8 @@
10621104
"@unsubscribeConfirmationDialogConfirmButton": {
10631105
"description": "Label for the 'Unsubscribe' button on a confirmation dialog for unsubscribing from a channel."
10641106
},
1065-
"@unsubscribeConfirmationDialogMessageMaybeCannotResubscribe": {
1066-
"description": "Message for a confirmation dialog for unsubscribing from a channel when you might not have permission to resubscribe."
1107+
"@unsubscribeConfirmationDialogMessageCannotResubscribe": {
1108+
"description": "Message for a confirmation dialog for unsubscribing from a channel when you will not have permission to resubscribe."
10671109
},
10681110
"@unsubscribeConfirmationDialogTitle": {
10691111
"description": "Title for a confirmation dialog for unsubscribing from a channel.",
@@ -1221,6 +1263,7 @@
12211263
"actionSheetOptionCopyMessageLink": "Link zur Nachricht kopieren",
12221264
"actionSheetOptionCopyMessageText": "Nachrichtentext kopieren",
12231265
"actionSheetOptionCopyTopicLink": "Link zum Thema kopieren",
1266+
"actionSheetOptionDeleteMessage": "Nachricht löschen",
12241267
"actionSheetOptionEditMessage": "Nachricht bearbeiten",
12251268
"actionSheetOptionFollowTopic": "Thema folgen",
12261269
"actionSheetOptionHideMutedMessage": "Stummgeschaltete Nachricht wieder ausblenden",
@@ -1245,9 +1288,12 @@
12451288
"actionSheetReadReceiptsErrorReadCount": "Laden von Empfangsbestätigungen fehlgeschlagen.",
12461289
"actionSheetReadReceiptsReadCount": "{count, plural, =1{Diese Nachricht wurde von einer Person <z-link>gelesen</z-link>:} other{Diese Nachricht wurde von {count} Personen <z-link>gelesen</z-link>:}}",
12471290
"actionSheetReadReceiptsZeroReadCount": "Niemand hat diese Nachricht bisher gelesen.",
1291+
"allChannelsEmptyPlaceholder": "Es gibt in dieser Organisation keine Kanäle die du ansehen kannst.",
1292+
"allChannelsPageTitle": "Alle Kanäle",
12481293
"appVersionUnknownPlaceholder": "(…)",
12491294
"channelFeedButtonTooltip": "Kanal-Feed",
12501295
"channelsEmptyPlaceholder": "Du hast noch keine Kanäle abonniert.",
1296+
"channelsEmptyPlaceholderWithAllChannelsLink": "Du hast noch keine Kanäle abonniert. Probiere zu <z-link>{allChannelsPageTitle}</z-link> zu gehen und ein paar von ihnen beizutreten.",
12511297
"channelsPageTitle": "Kanäle",
12521298
"chooseAccountButtonAddAnAccount": "Account hinzufügen",
12531299
"chooseAccountPageLogOutButton": "Abmelden",
@@ -1257,22 +1303,28 @@
12571303
"composeBoxAttachFromCameraTooltip": "Ein Foto aufnehmen",
12581304
"composeBoxAttachMediaTooltip": "Bilder oder Videos anhängen",
12591305
"composeBoxBannerButtonCancel": "Abbrechen",
1306+
"composeBoxBannerButtonRefresh": "Auffrischen",
12601307
"composeBoxBannerButtonSave": "Speichern",
1308+
"composeBoxBannerButtonSubscribe": "Abonnieren",
12611309
"composeBoxBannerLabelEditMessage": "Nachricht bearbeiten",
1310+
"composeBoxBannerLabelUnsubscribedWhenCannotSend": "Neue Nachrichten werden nicht automatisch angezeigt.",
12621311
"composeBoxChannelContentHint": "Nachricht an {destination}",
12631312
"composeBoxDmContentHint": "Nachricht an @{user}",
12641313
"composeBoxEnterTopicOrSkipHintText": "Gib ein Thema ein (leer lassen für “{defaultTopicName}”)",
12651314
"composeBoxGenericContentHint": "Eine Nachricht eingeben",
12661315
"composeBoxGroupDmContentHint": "Nachricht an Gruppe",
12671316
"composeBoxLoadingMessage": "(lade Nachricht {messageId})",
1268-
"composeBoxSelfDmContentHint": "Schreibe etwas",
1317+
"composeBoxSelfDmContentHint": "Schreibe dir selbst eine Notiz",
12691318
"composeBoxSendTooltip": "Senden",
12701319
"composeBoxTopicHintText": "Thema",
12711320
"composeBoxUploadingFilename": "Lade {filename} hoch…",
12721321
"contentValidationErrorEmpty": "Du hast nichts zum Senden!",
12731322
"contentValidationErrorQuoteAndReplyInProgress": "Bitte warte bis das Zitat abgeschlossen ist.",
12741323
"contentValidationErrorTooLong": "Nachrichtenlänge sollte nicht größer als 10000 Zeichen sein.",
12751324
"contentValidationErrorUploadInProgress": "Bitte warte bis das Hochladen abgeschlossen ist.",
1325+
"deleteMessageConfirmationDialogConfirmButton": "Löschen",
1326+
"deleteMessageConfirmationDialogMessage": "Das Löschen einer Nachricht entfernt diese permanent für alle Nutzer:innen.",
1327+
"deleteMessageConfirmationDialogTitle": "Nachricht löschen?",
12761328
"dialogCancel": "Abbrechen",
12771329
"dialogClose": "Schließen",
12781330
"dialogContinue": "Fortsetzen",
@@ -1303,6 +1355,7 @@
13031355
"errorCouldNotOpenLink": "Link konnte nicht geöffnet werden: {url}",
13041356
"errorCouldNotOpenLinkTitle": "Link kann nicht geöffnet werden",
13051357
"errorCouldNotShowUserProfile": "Nutzerprofil kann nicht angezeigt werden.",
1358+
"errorDeleteMessageFailedTitle": "Löschen der Nachricht fehlgeschlagen",
13061359
"errorDialogContinue": "OK",
13071360
"errorDialogLearnMore": "Mehr erfahren",
13081361
"errorDialogTitle": "Fehler",
@@ -1395,6 +1448,7 @@
13951448
"messageListGroupYouWithYourself": "Nachrichten mit dir selbst",
13961449
"messageNotSentLabel": "NACHRICHT NICHT GESENDET",
13971450
"mutedUser": "Stummgeschaltete:r Nutzer:in",
1451+
"navButtonAllChannels": "Alle Kanäle",
13981452
"newDmFabButtonLabel": "Neue DN",
13991453
"newDmSheetComposeButtonLabel": "Verfassen",
14001454
"newDmSheetNoUsersFound": "Keine Nutzer:innen gefunden",
@@ -1475,7 +1529,7 @@
14751529
"unknownUserName": "(Nutzer:in unbekannt)",
14761530
"unpinnedSubscriptionsLabel": "Nicht angeheftet",
14771531
"unsubscribeConfirmationDialogConfirmButton": "Deabonnieren",
1478-
"unsubscribeConfirmationDialogMessageMaybeCannotResubscribe": "Wenn du diesen Kanal verlässt, kannst du sich vielleicht nicht wieder beitreten.",
1532+
"unsubscribeConfirmationDialogMessageCannotResubscribe": "Sobald du diesen Kanal verlässt, kannst du ihm nicht mehr beitreten.",
14791533
"unsubscribeConfirmationDialogTitle": "{channelName} deabonnieren?",
14801534
"unsubscribeFailedTitle": "Konnte nicht deabonnieren",
14811535
"updateStatusErrorTitle": "Fehler beim Update des Benutzerstatus. Bitte versuche es nochmal.",

assets/l10n/app_el.arb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

assets/l10n/app_en.arb

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@
8080
"@allChannelsPageTitle": {
8181
"description": "Title for the 'All channels' page."
8282
},
83-
"allChannelsEmptyPlaceholder": "There are no channels you can view in this organization.",
84-
"@allChannelsEmptyPlaceholder": {
83+
"allChannelsEmptyPlaceholderHeader": "There are no channels you can view in this organization.",
84+
"@allChannelsEmptyPlaceholderHeader": {
8585
"description": "Centered text on the 'All channels' page saying that there is no content to show."
8686
},
8787
"profileButtonSendDirectMessage": "Send direct message",
@@ -329,6 +329,10 @@
329329
"@errorCouldNotFetchMessageSource": {
330330
"description": "Error message when the source of a message could not be fetched."
331331
},
332+
"errorCouldNotAccessUploadedFileTitle": "Could not access uploaded file",
333+
"@errorCouldNotAccessUploadedFileTitle": {
334+
"description": "Error title on failure in opening a file someone previously uploaded to Zulip"
335+
},
332336
"errorCopyingFailed": "Copying failed",
333337
"@errorCopyingFailed": {
334338
"description": "Error message when copying the text of a message to the user's system clipboard failed."
@@ -1086,10 +1090,14 @@
10861090
"@inboxPageTitle": {
10871091
"description": "Title for the page with unreads."
10881092
},
1089-
"inboxEmptyPlaceholder": "There are no unread messages in your inbox. Use the buttons below to view the combined feed or list of channels.",
1090-
"@inboxEmptyPlaceholder": {
1093+
"inboxEmptyPlaceholderHeader": "There are no unread messages in your inbox.",
1094+
"@inboxEmptyPlaceholderHeader": {
10911095
"description": "Centered text on the 'Inbox' page saying that there is no content to show."
10921096
},
1097+
"inboxEmptyPlaceholderMessage": "Use the buttons below to view the combined feed or list of channels.",
1098+
"@inboxEmptyPlaceholderMessage": {
1099+
"description": "Additional centered text on the 'Inbox' page saying that there is no content to show."
1100+
},
10931101
"recentDmConversationsPageTitle": "Direct messages",
10941102
"@recentDmConversationsPageTitle": {
10951103
"description": "Title for the page with a list of DM conversations."
@@ -1098,10 +1106,14 @@
10981106
"@recentDmConversationsSectionHeader": {
10991107
"description": "Heading for direct messages section on the 'Inbox' message view."
11001108
},
1101-
"recentDmConversationsEmptyPlaceholder": "You have no direct messages yet! Why not start the conversation?",
1102-
"@recentDmConversationsEmptyPlaceholder": {
1109+
"recentDmConversationsEmptyPlaceholderHeader": "You have no direct messages yet!",
1110+
"@recentDmConversationsEmptyPlaceholderHeader": {
11031111
"description": "Centered text on the 'Direct messages' page saying that there is no content to show."
11041112
},
1113+
"recentDmConversationsEmptyPlaceholderMessage": "Why not start a conversation?",
1114+
"@recentDmConversationsEmptyPlaceholderMessage": {
1115+
"description": "Additional centered text on the 'Direct messages' page saying that there is no content to show."
1116+
},
11051117
"combinedFeedPageTitle": "Combined feed",
11061118
"@combinedFeedPageTitle": {
11071119
"description": "Page title for the 'Combined feed' message view."
@@ -1118,12 +1130,12 @@
11181130
"@channelsPageTitle": {
11191131
"description": "Title for the page with a list of subscribed channels."
11201132
},
1121-
"channelsEmptyPlaceholder": "You’re not subscribed to any channels yet.",
1122-
"@channelsEmptyPlaceholder": {
1133+
"channelsEmptyPlaceholderHeader": "You’re not subscribed to any channels yet.",
1134+
"@channelsEmptyPlaceholderHeader": {
11231135
"description": "Centered text on the 'Channels' page saying that there is no content to show."
11241136
},
1125-
"channelsEmptyPlaceholderWithAllChannelsLink": "You’re not subscribed to any channels yet. Try going to <z-link>{allChannelsPageTitle}</z-link> and joining some of them.",
1126-
"@channelsEmptyPlaceholderWithAllChannelsLink": {
1137+
"channelsEmptyPlaceholderMessage": "Try going to <z-link>{allChannelsPageTitle}</z-link> and joining some of them.",
1138+
"@channelsEmptyPlaceholderMessage": {
11271139
"description": "Centered text on the 'Channels' page saying that there is no content to show, with a link to 'All channels'.",
11281140
"placeholders": {
11291141
"allChannelsPageTitle": {"type": "String", "example": "All channels"}

assets/l10n/app_es.arb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

0 commit comments

Comments
 (0)