From c46e5e006ca1774e852ad9abfcfeb2f176bd8b20 Mon Sep 17 00:00:00 2001 From: Sergey Pak Date: Wed, 16 Oct 2024 11:06:57 +0200 Subject: [PATCH] IJPL-164295 rename Settings Sync to Backup and Sync (UI & plugin page) as a part of IJPL-159504 Pivot "Settings Sync" to "Backup and Sync" GitOrigin-RevId: d13eb3cf3af9382c3dea4d2d9e48265aa1865ea3 --- .../resources/intellij.settingsSync.git.xml | 4 +- .../git/SettingsHistoryLogUiFactory.kt | 2 +- .../git/SettingsHistoryToolWindowFactory.kt | 2 +- .../resources/META-INF/plugin.xml | 4 +- .../messages/SettingsSyncBundle.properties | 56 +++++++++---------- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/plugins/settings-sync/git/resources/intellij.settingsSync.git.xml b/plugins/settings-sync/git/resources/intellij.settingsSync.git.xml index ecbf398d7451..c9545feb1d98 100644 --- a/plugins/settings-sync/git/resources/intellij.settingsSync.git.xml +++ b/plugins/settings-sync/git/resources/intellij.settingsSync.git.xml @@ -9,8 +9,8 @@ - + diff --git a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryLogUiFactory.kt b/plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryLogUiFactory.kt index 155a2fcf2ddb..6f99a0424a81 100644 --- a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryLogUiFactory.kt +++ b/plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryLogUiFactory.kt @@ -10,7 +10,7 @@ import com.intellij.vcs.log.visible.filters.VcsLogFilterObject class SettingsHistoryLogUiFactory : VcsLogManager.VcsLogUiFactory { override fun createLogUi(project: Project, logData: VcsLogData): SettingsHistoryLogUi { - val logId = "Settings Sync History" + val logId = "Backup and Sync History" val filters = VcsLogFilterObject.EMPTY_COLLECTION val filterer = VcsLogFiltererImpl(logData) diff --git a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryToolWindowFactory.kt b/plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryToolWindowFactory.kt index 0eb41c4a7b1e..e50b2a68fd0c 100644 --- a/plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryToolWindowFactory.kt +++ b/plugins/settings-sync/git/src/com/intellij/settingsSync/git/SettingsHistoryToolWindowFactory.kt @@ -23,7 +23,7 @@ import kotlinx.coroutines.withContext class SettingsHistoryToolWindowFactory(private val corotineScope: CoroutineScope) : ToolWindowFactory, DumbAware { companion object { - const val ID = "Settings Sync History" + const val ID = "Backup and Sync History" } init { diff --git a/plugins/settings-sync/resources/META-INF/plugin.xml b/plugins/settings-sync/resources/META-INF/plugin.xml index c016e4b0e75b..17f6b536e744 100644 --- a/plugins/settings-sync/resources/META-INF/plugin.xml +++ b/plugins/settings-sync/resources/META-INF/plugin.xml @@ -1,5 +1,5 @@ - Settings Sync + Backup and Sync com.intellij.settingsSync IDE Settings diff --git a/plugins/settings-sync/resources/messages/SettingsSyncBundle.properties b/plugins/settings-sync/resources/messages/SettingsSyncBundle.properties index bf163752e423..77da004fc079 100644 --- a/plugins/settings-sync/resources/messages/SettingsSyncBundle.properties +++ b/plugins/settings-sync/resources/messages/SettingsSyncBundle.properties @@ -1,18 +1,18 @@ action.settingsSync.manualPush.text=Push Settings -action.settingsSync.troubleShoot.text=Settings Sync Troubleshooting -action.settingsSync.history.text=Settings Sync History +action.settingsSync.troubleShoot.text=Backup and Sync Troubleshooting +action.settingsSync.history.text=Backup and Sync History -settingsSync.errors.notificationGroup=Settings Sync messages +settingsSync.errors.notificationGroup=Backup and Sync messages notification.title.push.error=Couldn't synchronize settings notification.title.update.error=Couldn't get settings from server notification.title.update.no.such.file=No settings file on the server progress.title.updating.settings.from.server=Updating settings from server\u2026 notification.title.apply.error=Couldn't apply settings -action.SettingsSyncStatusAction.text=Settings Sync -action.SettingsSyncOpenSettingsAction.text=Settings Sync\u2026 +action.SettingsSyncStatusAction.text=Backup and Sync +action.SettingsSyncOpenSettingsAction.text=Backup and Sync\u2026 -title.settings.sync=Settings Sync +title.settings.sync=Backup and Sync configurable.what.to.sync.label=Configure what to sync: # suppress inspection "UnusedProperty" -- computed key settings.category.ui.name=UI settings @@ -40,22 +40,22 @@ settings.category.system.name=System settings settings.category.system.description= config.button.login=Log in with JetBrains Account\u2026 # config.button.logout=Log Out... -config.button.enable=Enable Settings Sync\u2026 -config.button.disable=Disable Settings Sync\u2026 +config.button.enable=Enable Backup and Sync\u2026 +config.button.disable=Disable Backup and Sync\u2026 enable.dialog.select.what.to.sync=Select what settings to sync: -enable.dialog.enable.sync.action=Enable Sync +enable.dialog.enable.sync.action=Enable Backup and Sync enable.dialog.sync.local.settings=Push Settings to Account enable.dialog.get.settings.from.account=Get Settings from Account enable.sync.check.server.data.progress=Checking Server Data\u2026 enable.sync.get.from.server.progress=Getting Settings from Server\u2026 enable.sync.push.to.server.progress=Pushing Settings to Server\u2026 -disable.dialog.title=Disable settings sync? +disable.dialog.title=Disable Backup and Sync? disable.dialog.text=The settings will not be synced anymore disable.dialog.remove.data.box=Remove data from JB account and disable for all IDEs disable.dialog.disable.button=Disable disable.remove.data.title=Removing Server Data\u2026 disable.remove.data.failure=Unable to remove data from server -status.action.settings.sync=Settings Sync\u2026 +status.action.settings.sync=Backup and Sync\u2026 status.action.settings.sync.is.off=Off status.action.settings.sync.is.on=On status.action.settings.sync.failed=Failed @@ -84,17 +84,17 @@ sync.notification.restart.message.list.entry.plugin.disable=Disable {0,choice,1# sync.restart.notification.submessage.plugins={0} plugin(s): {1}\u2026 # {0} - IDE name, i.e. Android Studio, MPS, etc. sync.restart.notification.action=Restart {0} -sync.status.enabled=Sync enabled -sync.status.disabled=Sync disabled +sync.status.enabled=Backup and Sync enabled +sync.status.disabled=Backup and Sync disabled sync.status.failed=Sync failed. -sync.status.login.message=Login to enable settings sync +sync.status.login.message=Login to enable Backup and Sync # {0} is last sync time (human-readable), {1} is a user name, for example: "Last synced 5 minutes ago for John.Doe" sync.status.last.sync.message=Last synced {0} for {1}. # The full (original) message is "..., install JetBrains Marketplace Licensing Support" # but the plugin name is rendered in a separate component and doesn't need to be translated -sync.status.login.not.available=To enable Setting Sync, install +sync.status.login.not.available=To enable Backup and Sync, install # {0} - IDE name, i.e. Android Studio, MPS, etc. -sync.status.restart.required=To enable Setting Sync, restart {0} +sync.status.restart.required=To enable Backup and Sync, restart {0} sync.status.restart.ide.button=Restart sync.notification.git.state.restore.failed.title=Failed to restore settings state @@ -108,12 +108,12 @@ settings.cross.product.sync=Sync settings across: settings.cross.product.sync.choice.only.this.product={0} instances only settings.cross.product.sync.choice.all.products=All JetBrains IDE products -settings.warning.sync.cannot.be.enabled.label=Settings Sync cannot be enabled with the Settings Repository configured +settings.warning.sync.cannot.be.enabled.label=Backup and Sync cannot be enabled with the Settings Repository configured -installing.plugins.indicator=Installing plugins from Settings Sync +installing.plugins.indicator=Installing plugins from Backup and Sync -troubleshooting.loading.info.progress.dialog.title=Loading information about settings sync\u2026 -troubleshooting.dialog.title=Settings Sync Troubleshooting +troubleshooting.loading.info.progress.dialog.title=Loading information about Backup and Sync\u2026 +troubleshooting.dialog.title=Backup and Sync Troubleshooting troubleshooting.dialog.server.url.label=Server URL: troubleshooting.dialog.login.label=Login: troubleshooting.dialog.email.label=Email: @@ -132,7 +132,7 @@ troubleshooting.dialog.error.loading.info.failed=Failed to Load Information from troubleshooting.dialog.downloading.settings.from.server.progress.title=Downloading Settings from Server\u2026 troubleshooting.dialog.successfully.downloaded.message=Downloaded the file troubleshooting.dialog.error.check.log.file.for.errors=Check the log file for errors -troubleshooting.dialog.error.wrong.configuration=Settings Sync Troubleshooting doesn''t work for {0} +troubleshooting.dialog.error.wrong.configuration=Backup and Sync Troubleshooting doesn''t work for {0} troubleshooting.dialog.local.status.label=Local status: troubleshooting.dialog.applicationId.label=Application ID: troubleshooting.dialog.machineInfo.label=Machine: @@ -141,12 +141,12 @@ troubleshooting.dialog.hostname.label=Host name: troubleshooting.dialog.configFolder.label=Config folder: troubleshooting.dialog.files=Files: -history.dialog.title=Settings Sync History -history.error.message=Cannot find the settings sync storage +history.dialog.title=Backup and Sync History +history.error.message=Cannot find the Backup and Sync storage history.tab.name=History # settings history toolwindow title -toolwindow.stripe.Settings_Sync_History=Settings Sync History +toolwindow.stripe.Settings_Sync_History=Backup and Sync History ui.toolwindow.editor.diff.tab.title=Settings Diff: {0} ui.toolwindow.node.remote=Remote Changes ui.toolwindow.node.local=Local Changes @@ -170,15 +170,15 @@ ui.toolwindow.change.category.ui=UI Settings ui.toolwindow.change.category.other=Other settings.repository.unbundled.notification.title=The Settings Repository plugin was unbundled -settings.repository.unbundled.notification.description=You can install it manually or try Settings Sync via the JetBrains cloud server. +settings.repository.unbundled.notification.description=You can install it manually or try Backup and Sync via the JetBrains cloud server. settings.repository.unbundled.notification.action.install.settings.repository=Install Settings Repository -settings.repository.unbundled.notification.action.use.new.settings.sync=Use Settings Sync +settings.repository.unbundled.notification.action.use.new.settings.sync=Use Backup and Sync # {0} is a plugin id install.plugin.failed.no.compatible.notification.error.message=No last compatible plugin found for {0} settings.group.sync.state.disable.locally=Disable locally -promotion.in.settings.text=Settings Sync saves your settings across all devices for an easy backup and seamless work experience +promotion.in.settings.text=Backup and Sync saves your settings across all devices for an easy backup and seamless work experience promotion.in.settings.header=Back Up Your Settings -promotion.in.settings.open=Go to Settings Sync +promotion.in.settings.open=Go to Backup and Sync promotion.in.settings.skip=Skip \ No newline at end of file