Skip to content

Commit 5c616c7

Browse files
AhmedTareekAhmedTareek
authored
Merge branch 'main' into main
2 parents 98bbfde + e524e6b commit 5c616c7

Some content is hidden

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

48 files changed

+3543
-396
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Autogenerated from Pigeon (v24.2.1), do not edit directly.
1+
// Autogenerated from Pigeon (v25.0.0), do not edit directly.
22
// See also: https://pub.dev/packages/pigeon
33
@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
44

‎assets/l10n/app_en.arb

+8
Original file line numberDiff line numberDiff line change
@@ -826,6 +826,14 @@
826826
"@pollWidgetOptionsMissing": {
827827
"description": "Text to display for a poll when it has no options"
828828
},
829+
"experimentalFeatureSettingsPageTitle": "Experimental features",
830+
"@experimentalFeatureSettingsPageTitle": {
831+
"description": "Title of settings page for experimental, in-development features"
832+
},
833+
"experimentalFeatureSettingsWarning": "These options enable features which are still under development and not ready. They may not work, and may cause issues in other areas of the app.\n\nThe purpose of these settings is for experimentation by people working on developing Zulip.",
834+
"@experimentalFeatureSettingsWarning": {
835+
"description": "Warning text on settings page for experimental, in-development features"
836+
},
829837
"errorNotificationOpenTitle": "Failed to open notification",
830838
"@errorNotificationOpenTitle": {
831839
"description": "Error title when notification opening fails"

‎assets/l10n/app_pl.arb

+95-5
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@
585585
"@composeBoxSendTooltip": {
586586
"description": "Tooltip for send button in compose box."
587587
},
588-
"messageListGroupYouWithYourself": "Ty ze sobą",
588+
"messageListGroupYouWithYourself": "Zapiski na własne konto",
589589
"@messageListGroupYouWithYourself": {
590590
"description": "Message list recipient header for a DM group that only includes yourself."
591591
},
@@ -597,10 +597,6 @@
597597
"@aboutPageTitle": {
598598
"description": "Title for About Zulip page."
599599
},
600-
"errorLoginCouldNotConnectTitle": "Nie można połączyć",
601-
"@errorLoginCouldNotConnectTitle": {
602-
"description": "Error title when the app could not connect to the server."
603-
},
604600
"contentValidationErrorEmpty": "Nie masz nic do wysłania!",
605601
"@contentValidationErrorEmpty": {
606602
"description": "Content validation error message when the message is empty."
@@ -886,5 +882,99 @@
886882
"unpinnedSubscriptionsLabel": "Odpięte",
887883
"@unpinnedSubscriptionsLabel": {
888884
"description": "Label for the list of unpinned subscribed channels."
885+
},
886+
"actionSheetOptionResolveTopic": "Oznacz jako rozwiązany",
887+
"@actionSheetOptionResolveTopic": {
888+
"description": "Label for the 'Mark as resolved' button on the topic action sheet."
889+
},
890+
"actionSheetOptionUnresolveTopic": "Oznacz brak rozwiązania",
891+
"@actionSheetOptionUnresolveTopic": {
892+
"description": "Label for the 'Mark as unresolved' button on the topic action sheet."
893+
},
894+
"errorResolveTopicFailedTitle": "Nie udało się oznaczyć jako rozwiązany",
895+
"@errorResolveTopicFailedTitle": {
896+
"description": "Error title when marking a topic as resolved failed."
897+
},
898+
"errorUnresolveTopicFailedTitle": "Nie udało się oznaczyć brak rozwiązania",
899+
"@errorUnresolveTopicFailedTitle": {
900+
"description": "Error title when marking a topic as unresolved failed."
901+
},
902+
"appVersionUnknownPlaceholder": "(…)",
903+
"@appVersionUnknownPlaceholder": {
904+
"description": "Placeholder to show in place of the app version when it is unknown."
905+
},
906+
"zulipAppTitle": "Zulip",
907+
"@zulipAppTitle": {
908+
"description": "The name of Zulip. This should be either 'Zulip' or a transliteration."
909+
},
910+
"filenameAndSizeInMiB": "{filename}: {size} MiB",
911+
"@filenameAndSizeInMiB": {
912+
"description": "The name of a file, and its size in mebibytes.",
913+
"placeholders": {
914+
"filename": {
915+
"type": "String",
916+
"example": "foo.txt"
917+
},
918+
"size": {
919+
"type": "String",
920+
"example": "20.2"
921+
}
922+
}
923+
},
924+
"errorInvalidApiKeyMessage": "Konto w ramach {url} nie zostało przyjęte. Spróbuj ponownie lub skorzystaj z innego konta.",
925+
"@errorInvalidApiKeyMessage": {
926+
"description": "Error message in the dialog for invalid API key.",
927+
"placeholders": {
928+
"url": {
929+
"type": "String",
930+
"example": "http://chat.example.com/"
931+
}
932+
}
933+
},
934+
"errorCouldNotConnectTitle": "Brak połączenia",
935+
"@errorCouldNotConnectTitle": {
936+
"description": "Error title when the app could not connect to the server."
937+
},
938+
"composeBoxChannelContentHint": "Wiadomość do {destination}",
939+
"@composeBoxChannelContentHint": {
940+
"description": "Hint text for content input when sending a message to a channel.",
941+
"placeholders": {
942+
"destination": {
943+
"type": "String",
944+
"example": "#channel name > topic name"
945+
}
946+
}
947+
},
948+
"actionSheetOptionMarkChannelAsRead": "Oznacz kanał jako przeczytany",
949+
"@actionSheetOptionMarkChannelAsRead": {
950+
"description": "Label for marking a channel as read."
951+
},
952+
"actionSheetOptionMarkTopicAsRead": "Oznacz wątek jako przeczytany",
953+
"@actionSheetOptionMarkTopicAsRead": {
954+
"description": "Option to mark a specific topic as read in the action sheet."
955+
},
956+
"themeSettingLight": "Jasny",
957+
"@themeSettingLight": {
958+
"description": "Label for light theme setting."
959+
},
960+
"themeSettingSystem": "Systemowy",
961+
"@themeSettingSystem": {
962+
"description": "Label for system theme setting."
963+
},
964+
"themeSettingDark": "Ciemny",
965+
"@themeSettingDark": {
966+
"description": "Label for dark theme setting."
967+
},
968+
"themeSettingTitle": "WYSTRÓJ",
969+
"@themeSettingTitle": {
970+
"description": "Title for theme setting. (Use ALL CAPS for cased alphabets: Latin, Greek, Cyrillic, etc.)"
971+
},
972+
"settingsPageTitle": "Ustawienia",
973+
"@settingsPageTitle": {
974+
"description": "Title for the settings page."
975+
},
976+
"openLinksWithInAppBrowser": "Otwieraj odnośniki w aplikacji",
977+
"@openLinksWithInAppBrowser": {
978+
"description": "Label for toggling setting to open links with in-app browser"
889979
}
890980
}

‎assets/l10n/app_ru.arb

-4
Original file line numberDiff line numberDiff line change
@@ -325,10 +325,6 @@
325325
}
326326
}
327327
},
328-
"errorLoginCouldNotConnectTitle": "Не удалось подключиться",
329-
"@errorLoginCouldNotConnectTitle": {
330-
"description": "Error title when the app could not connect to the server."
331-
},
332328
"errorMessageDoesNotSeemToExist": "Это сообщение, похоже, отсутствует.",
333329
"@errorMessageDoesNotSeemToExist": {
334330
"description": "Error message when loading a message that does not exist."

‎assets/l10n/app_sk.arb

-4
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,6 @@
171171
}
172172
}
173173
},
174-
"errorLoginCouldNotConnectTitle": "Nepodarilo sa pripojiť",
175-
"@errorLoginCouldNotConnectTitle": {
176-
"description": "Error title when the app could not connect to the server."
177-
},
178174
"errorMessageDoesNotSeemToExist": "Správa zrejme neexistuje.",
179175
"@errorMessageDoesNotSeemToExist": {
180176
"description": "Error message when loading a message that does not exist."

‎docs/changelog.md

+29
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,35 @@
33
## Unreleased
44

55

6+
## 0.0.27 (2025-03-17)
7+
8+
### Highlights for users
9+
10+
* Handle website previews in messages. (#1016)
11+
* Settings for dark vs. light theme, or opening links
12+
in a browser within or outside the app. (#1216, #1228)
13+
* Better handle moved or resolved topics: follow topic permalinks
14+
(#1028), and update inbox (#901).
15+
* Design updates including dark-theme contrast (#973), autocomplete
16+
results (#913), and app icons (#1254, #415, (Android: #1402, #1401)).
17+
* Too many other improvements and fixes to describe them all here.
18+
19+
20+
### Highlights for developers
21+
22+
* We now have a GitHub action making a weekly PR to update
23+
translations from Weblate. (#276)
24+
25+
* All user-facing strings are now wired up for translation, or else
26+
have a comment saying why translation wouldn't be appropriate or
27+
is currently difficult. (#277)
28+
29+
* Resolved: #277, part of #1210, #1319, #1358, #1130, #1247, #737,
30+
#1246, #1172, #1028, #1016, PR #1380, #1178, #59, #1356, #973,
31+
PR #1315, #913, #1225, #1357, #1226, #1216, #1354, #1254, #415,
32+
#1402, #1401, #1228, part of #901
33+
34+
635
## 0.0.26 (2025-02-07)
736

837
### Highlights for users

‎ios/Flutter/Zulip.xcconfig

-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,2 @@
11
// Configuration settings file format documentation can be found at:
22
// https://help.apple.com/xcode/#/dev745c5c974
3-
4-
// TODO(firebase/flutterfire#13323): remove this flag
5-
//
6-
// This flag is added to work around the iOS build failing
7-
// on Xcode 16. Remove it when `package:firebase_messaging`
8-
// is patched with a fix to build successfully on Xcode 16:
9-
// https://github.com/firebase/flutterfire/issues/13323
10-
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES=YES

‎lib/generated/l10n/zulip_localizations.dart

+12
Original file line numberDiff line numberDiff line change
@@ -1203,6 +1203,18 @@ abstract class ZulipLocalizations {
12031203
/// **'This poll has no options yet.'**
12041204
String get pollWidgetOptionsMissing;
12051205

1206+
/// Title of settings page for experimental, in-development features
1207+
///
1208+
/// In en, this message translates to:
1209+
/// **'Experimental features'**
1210+
String get experimentalFeatureSettingsPageTitle;
1211+
1212+
/// Warning text on settings page for experimental, in-development features
1213+
///
1214+
/// In en, this message translates to:
1215+
/// **'These options enable features which are still under development and not ready. They may not work, and may cause issues in other areas of the app.\n\nThe purpose of these settings is for experimentation by people working on developing Zulip.'**
1216+
String get experimentalFeatureSettingsWarning;
1217+
12061218
/// Error title when notification opening fails
12071219
///
12081220
/// In en, this message translates to:

‎lib/generated/l10n/zulip_localizations_ar.dart

+6
Original file line numberDiff line numberDiff line change
@@ -651,6 +651,12 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
651651
@override
652652
String get pollWidgetOptionsMissing => 'This poll has no options yet.';
653653

654+
@override
655+
String get experimentalFeatureSettingsPageTitle => 'Experimental features';
656+
657+
@override
658+
String get experimentalFeatureSettingsWarning => 'These options enable features which are still under development and not ready. They may not work, and may cause issues in other areas of the app.\n\nThe purpose of these settings is for experimentation by people working on developing Zulip.';
659+
654660
@override
655661
String get errorNotificationOpenTitle => 'Failed to open notification';
656662

‎lib/generated/l10n/zulip_localizations_en.dart

+6
Original file line numberDiff line numberDiff line change
@@ -651,6 +651,12 @@ class ZulipLocalizationsEn extends ZulipLocalizations {
651651
@override
652652
String get pollWidgetOptionsMissing => 'This poll has no options yet.';
653653

654+
@override
655+
String get experimentalFeatureSettingsPageTitle => 'Experimental features';
656+
657+
@override
658+
String get experimentalFeatureSettingsWarning => 'These options enable features which are still under development and not ready. They may not work, and may cause issues in other areas of the app.\n\nThe purpose of these settings is for experimentation by people working on developing Zulip.';
659+
654660
@override
655661
String get errorNotificationOpenTitle => 'Failed to open notification';
656662

‎lib/generated/l10n/zulip_localizations_ja.dart

+6
Original file line numberDiff line numberDiff line change
@@ -651,6 +651,12 @@ class ZulipLocalizationsJa extends ZulipLocalizations {
651651
@override
652652
String get pollWidgetOptionsMissing => 'This poll has no options yet.';
653653

654+
@override
655+
String get experimentalFeatureSettingsPageTitle => 'Experimental features';
656+
657+
@override
658+
String get experimentalFeatureSettingsWarning => 'These options enable features which are still under development and not ready. They may not work, and may cause issues in other areas of the app.\n\nThe purpose of these settings is for experimentation by people working on developing Zulip.';
659+
654660
@override
655661
String get errorNotificationOpenTitle => 'Failed to open notification';
656662

‎lib/generated/l10n/zulip_localizations_nb.dart

+6
Original file line numberDiff line numberDiff line change
@@ -651,6 +651,12 @@ class ZulipLocalizationsNb extends ZulipLocalizations {
651651
@override
652652
String get pollWidgetOptionsMissing => 'This poll has no options yet.';
653653

654+
@override
655+
String get experimentalFeatureSettingsPageTitle => 'Experimental features';
656+
657+
@override
658+
String get experimentalFeatureSettingsWarning => 'These options enable features which are still under development and not ready. They may not work, and may cause issues in other areas of the app.\n\nThe purpose of these settings is for experimentation by people working on developing Zulip.';
659+
654660
@override
655661
String get errorNotificationOpenTitle => 'Failed to open notification';
656662

0 commit comments

Comments
 (0)