From 281efe0d0dab99677f18786e65a6e628252436a2 Mon Sep 17 00:00:00 2001 From: Ming Ming Date: Wed, 27 Nov 2024 23:23:52 +0800 Subject: [PATCH] Rename Album and Nextcloud album, as they are very confusing --- app/lib/l10n/app_en.arb | 14 ++-- app/lib/l10n/untranslated-messages.txt | 74 ++++++++++++++++---- app/lib/widget/export_collection_dialog.dart | 8 +-- app/lib/widget/new_collection_dialog.dart | 8 +-- 4 files changed, 75 insertions(+), 29 deletions(-) diff --git a/app/lib/l10n/app_en.arb b/app/lib/l10n/app_en.arb index fb204832..6524266d 100644 --- a/app/lib/l10n/app_en.arb +++ b/app/lib/l10n/app_en.arb @@ -1108,12 +1108,12 @@ "@createCollectionTooltip": { "description": "Create a new collection. A collection can be an album, a folder, or something else in the future" }, - "createCollectionDialogAlbumLabel": "Album", - "@createCollectionDialogAlbumLabel": { + "createCollectionDialogAlbumLabel2": "Client side album", + "@createCollectionDialogAlbumLabel2": { "description": "Create an album as collection" }, - "createCollectionDialogAlbumDescription": "Show photos added by you from anywhere on the server", - "@createCollectionDialogAlbumDescription": { + "createCollectionDialogAlbumDescription2": "Album with extra features, accessible only with this app", + "@createCollectionDialogAlbumDescription2": { "description": "Describe how an album collection works" }, "createCollectionDialogFolderLabel": "Folder", @@ -1447,11 +1447,11 @@ "description": "Export an arbitrary Collection (typical one with generated contents) as a new static Collection" }, "exportCollectionDialogTitle": "Export collection", - "createCollectionDialogNextcloudAlbumLabel": "Nextcloud album", - "@createCollectionDialogNextcloudAlbumLabel": { + "createCollectionDialogNextcloudAlbumLabel2": "Server side album", + "@createCollectionDialogNextcloudAlbumLabel2": { "description": "Server-side albums that are available in Nextcloud 25+" }, - "createCollectionDialogNextcloudAlbumDescription": "Server-side album, require Nextcloud 25 or above", + "createCollectionDialogNextcloudAlbumDescription2": "Create an album on your server, accessible with any app", "removeCollectionsFailedNotification": "Failed to remove some collections", "accountSettingsTooltip": "Account settings", "contributorsTooltip": "Contributors", diff --git a/app/lib/l10n/untranslated-messages.txt b/app/lib/l10n/untranslated-messages.txt index d8e1d435..a82f840d 100644 --- a/app/lib/l10n/untranslated-messages.txt +++ b/app/lib/l10n/untranslated-messages.txt @@ -146,8 +146,8 @@ "homeFolderNotFoundDialogContent", "homeFolderInputInvalidEmpty", "createCollectionTooltip", - "createCollectionDialogAlbumLabel", - "createCollectionDialogAlbumDescription", + "createCollectionDialogAlbumLabel2", + "createCollectionDialogAlbumDescription2", "createCollectionDialogFolderLabel", "createCollectionDialogFolderDescription", "collectionFavoritesLabel", @@ -239,8 +239,8 @@ "setCollectionCoverFailureNotification", "exportCollectionTooltip", "exportCollectionDialogTitle", - "createCollectionDialogNextcloudAlbumLabel", - "createCollectionDialogNextcloudAlbumDescription", + "createCollectionDialogNextcloudAlbumLabel2", + "createCollectionDialogNextcloudAlbumDescription2", "removeCollectionsFailedNotification", "accountSettingsTooltip", "contributorsTooltip", @@ -290,6 +290,10 @@ "settingsCollectionsCustomizeNavigationBarTitle", "exifSupportNextcloud28Notes", "exifSupportConfirmationDialogTitle2", + "createCollectionDialogAlbumLabel2", + "createCollectionDialogAlbumDescription2", + "createCollectionDialogNextcloudAlbumLabel2", + "createCollectionDialogNextcloudAlbumDescription2", "alternativeSignIn", "livePhotoTooltip", "dragAndDropRearrangeButtons", @@ -307,6 +311,10 @@ "settingsCollectionsCustomizeNavigationBarTitle", "exifSupportNextcloud28Notes", "exifSupportConfirmationDialogTitle2", + "createCollectionDialogAlbumLabel2", + "createCollectionDialogAlbumDescription2", + "createCollectionDialogNextcloudAlbumLabel2", + "createCollectionDialogNextcloudAlbumDescription2", "alternativeSignIn", "livePhotoTooltip", "dragAndDropRearrangeButtons", @@ -378,6 +386,8 @@ "shareMethodPreviewDescription", "shareMethodOriginalFileTitle", "shareMethodOriginalFileDescription", + "createCollectionDialogAlbumLabel2", + "createCollectionDialogAlbumDescription2", "enhanceLowLightDescription", "collectionEditedPhotosLabel", "enhancePortraitBlurDescription", @@ -443,8 +453,8 @@ "setCollectionCoverFailureNotification", "exportCollectionTooltip", "exportCollectionDialogTitle", - "createCollectionDialogNextcloudAlbumLabel", - "createCollectionDialogNextcloudAlbumDescription", + "createCollectionDialogNextcloudAlbumLabel2", + "createCollectionDialogNextcloudAlbumDescription2", "removeCollectionsFailedNotification", "accountSettingsTooltip", "contributorsTooltip", @@ -486,6 +496,10 @@ "settingsCollectionsCustomizeNavigationBarTitle", "exifSupportNextcloud28Notes", "exifSupportConfirmationDialogTitle2", + "createCollectionDialogAlbumLabel2", + "createCollectionDialogAlbumDescription2", + "createCollectionDialogNextcloudAlbumLabel2", + "createCollectionDialogNextcloudAlbumDescription2", "alternativeSignIn", "livePhotoTooltip", "dragAndDropRearrangeButtons", @@ -520,6 +534,10 @@ "settingsRestartNeededDialog", "exifSupportNextcloud28Notes", "exifSupportConfirmationDialogTitle2", + "createCollectionDialogAlbumLabel2", + "createCollectionDialogAlbumDescription2", + "createCollectionDialogNextcloudAlbumLabel2", + "createCollectionDialogNextcloudAlbumDescription2", "appLockUnlockHint", "appLockUnlockWrongPassword", "enabledText", @@ -573,6 +591,10 @@ "settingsRestartNeededDialog", "exifSupportNextcloud28Notes", "exifSupportConfirmationDialogTitle2", + "createCollectionDialogAlbumLabel2", + "createCollectionDialogAlbumDescription2", + "createCollectionDialogNextcloudAlbumLabel2", + "createCollectionDialogNextcloudAlbumDescription2", "appLockUnlockHint", "appLockUnlockWrongPassword", "enabledText", @@ -630,7 +652,11 @@ "exifSupportConfirmationDialogTitle2", "unmuteTooltip", "slideshowTooltip", + "createCollectionDialogAlbumLabel2", + "createCollectionDialogAlbumDescription2", "enhanceColorPopTitle", + "createCollectionDialogNextcloudAlbumLabel2", + "createCollectionDialogNextcloudAlbumDescription2", "appLockUnlockHint", "appLockUnlockWrongPassword", "enabledText", @@ -923,8 +949,8 @@ "homeFolderNotFoundDialogContent", "homeFolderInputInvalidEmpty", "createCollectionTooltip", - "createCollectionDialogAlbumLabel", - "createCollectionDialogAlbumDescription", + "createCollectionDialogAlbumLabel2", + "createCollectionDialogAlbumDescription2", "createCollectionDialogFolderLabel", "createCollectionDialogFolderDescription", "collectionFavoritesLabel", @@ -1016,8 +1042,8 @@ "setCollectionCoverFailureNotification", "exportCollectionTooltip", "exportCollectionDialogTitle", - "createCollectionDialogNextcloudAlbumLabel", - "createCollectionDialogNextcloudAlbumDescription", + "createCollectionDialogNextcloudAlbumLabel2", + "createCollectionDialogNextcloudAlbumDescription2", "removeCollectionsFailedNotification", "accountSettingsTooltip", "contributorsTooltip", @@ -1085,9 +1111,13 @@ "settingsRestartNeededDialog", "exifSupportNextcloud28Notes", "exifSupportConfirmationDialogTitle2", + "createCollectionDialogAlbumLabel2", + "createCollectionDialogAlbumDescription2", "enhanceColorPopTitle", "imageEditTransformOrientationClockwise", "imageEditTransformOrientationCounterclockwise", + "createCollectionDialogNextcloudAlbumLabel2", + "createCollectionDialogNextcloudAlbumDescription2", "appLockUnlockHint", "appLockUnlockWrongPassword", "enabledText", @@ -1147,6 +1177,8 @@ "settingsRestartNeededDialog", "exifSupportNextcloud28Notes", "exifSupportConfirmationDialogTitle2", + "createCollectionDialogAlbumLabel2", + "createCollectionDialogAlbumDescription2", "searchLandingPeopleListEmptyText2", "createCollectionFailureNotification", "addItemToCollectionTooltip", @@ -1154,8 +1186,8 @@ "setCollectionCoverFailureNotification", "exportCollectionTooltip", "exportCollectionDialogTitle", - "createCollectionDialogNextcloudAlbumLabel", - "createCollectionDialogNextcloudAlbumDescription", + "createCollectionDialogNextcloudAlbumLabel2", + "createCollectionDialogNextcloudAlbumDescription2", "removeCollectionsFailedNotification", "accountSettingsTooltip", "contributorsTooltip", @@ -1214,6 +1246,10 @@ "settingsRestartNeededDialog", "exifSupportNextcloud28Notes", "exifSupportConfirmationDialogTitle2", + "createCollectionDialogAlbumLabel2", + "createCollectionDialogAlbumDescription2", + "createCollectionDialogNextcloudAlbumLabel2", + "createCollectionDialogNextcloudAlbumDescription2", "appLockUnlockHint", "appLockUnlockWrongPassword", "enabledText", @@ -1250,6 +1286,10 @@ "settingsCollectionsCustomizeNavigationBarTitle", "exifSupportNextcloud28Notes", "exifSupportConfirmationDialogTitle2", + "createCollectionDialogAlbumLabel2", + "createCollectionDialogAlbumDescription2", + "createCollectionDialogNextcloudAlbumLabel2", + "createCollectionDialogNextcloudAlbumDescription2", "alternativeSignIn", "livePhotoTooltip", "dragAndDropRearrangeButtons", @@ -1292,6 +1332,8 @@ "exifSupportNextcloud28Notes", "exifSupportConfirmationDialogTitle2", "slideshowSetupDialogReverseTitle", + "createCollectionDialogAlbumLabel2", + "createCollectionDialogAlbumDescription2", "enhanceColorPopTitle", "enhanceRetouchTitle", "imageEditColorContrast", @@ -1313,6 +1355,8 @@ "gpsPlaceText", "imageSaveOptionDialogContent", "loopTooltip", + "createCollectionDialogNextcloudAlbumLabel2", + "createCollectionDialogNextcloudAlbumDescription2", "setAsTooltip", "deleteAccountConfirmDialogText", "appLockUnlockHint", @@ -1410,6 +1454,8 @@ "shareMethodPreviewDescription", "shareMethodOriginalFileTitle", "shareMethodOriginalFileDescription", + "createCollectionDialogAlbumLabel2", + "createCollectionDialogAlbumDescription2", "enhanceTooltip", "enhanceButtonLabel", "enhanceIntroDialogTitle", @@ -1486,8 +1532,8 @@ "setCollectionCoverFailureNotification", "exportCollectionTooltip", "exportCollectionDialogTitle", - "createCollectionDialogNextcloudAlbumLabel", - "createCollectionDialogNextcloudAlbumDescription", + "createCollectionDialogNextcloudAlbumLabel2", + "createCollectionDialogNextcloudAlbumDescription2", "removeCollectionsFailedNotification", "accountSettingsTooltip", "contributorsTooltip", diff --git a/app/lib/widget/export_collection_dialog.dart b/app/lib/widget/export_collection_dialog.dart index 2ab52975..9f852e23 100644 --- a/app/lib/widget/export_collection_dialog.dart +++ b/app/lib/widget/export_collection_dialog.dart @@ -221,18 +221,18 @@ enum _ProviderOption { String toValueString(BuildContext context) { switch (this) { case appAlbum: - return L10n.global().createCollectionDialogAlbumLabel; + return L10n.global().createCollectionDialogAlbumLabel2; case ncAlbum: - return L10n.global().createCollectionDialogNextcloudAlbumLabel; + return L10n.global().createCollectionDialogNextcloudAlbumLabel2; } } String toDescription(BuildContext context) { switch (this) { case appAlbum: - return L10n.global().createCollectionDialogAlbumDescription; + return L10n.global().createCollectionDialogAlbumDescription2; case ncAlbum: - return L10n.global().createCollectionDialogNextcloudAlbumDescription; + return L10n.global().createCollectionDialogNextcloudAlbumDescription2; } } } diff --git a/app/lib/widget/new_collection_dialog.dart b/app/lib/widget/new_collection_dialog.dart index dee8e0e2..24d5875a 100644 --- a/app/lib/widget/new_collection_dialog.dart +++ b/app/lib/widget/new_collection_dialog.dart @@ -287,26 +287,26 @@ enum _ProviderOption { String toValueString(BuildContext context) { switch (this) { case appAlbum: - return L10n.global().createCollectionDialogAlbumLabel; + return L10n.global().createCollectionDialogAlbumLabel2; case dir: return L10n.global().createCollectionDialogFolderLabel; case tag: return L10n.global().createCollectionDialogTagLabel; case ncAlbum: - return L10n.global().createCollectionDialogNextcloudAlbumLabel; + return L10n.global().createCollectionDialogNextcloudAlbumLabel2; } } String toDescription(BuildContext context) { switch (this) { case appAlbum: - return L10n.global().createCollectionDialogAlbumDescription; + return L10n.global().createCollectionDialogAlbumDescription2; case dir: return L10n.global().createCollectionDialogFolderDescription; case tag: return L10n.global().createCollectionDialogTagDescription; case ncAlbum: - return L10n.global().createCollectionDialogNextcloudAlbumDescription; + return L10n.global().createCollectionDialogNextcloudAlbumDescription2; } } }