Import-Export app everywhere

README.md

@@ -1,4 +1,4 @@
-# ProtonMail Bridge and Import Export
+# ProtonMail Bridge and Import Export app
 Copyright (c) 2020 Proton Technologies AG
 
 This repository holds the ProtonMail Bridge application.

cmd/Import-Export/main.go

@@ -65,7 +65,7 @@ func run(context *cli.Context) (contextError error) { // nolint[funlen]
 	// report which will not be possible if no folder can be created. That's the
 	// only problem we will not be notified about in any way.
 	panicHandler := &cmd.PanicHandler{
-		AppName: "ProtonMail Import-Export",
+		AppName: "ProtonMail Import-Export app",
 		Config:  cfg,
 		Err:     &contextError,
 	}

doc/importexport.md

@@ -1,8 +1,8 @@
-# Import-Export
+# Import-Export app
 
 ## Main blocks
 
-This is basic overview of the main import-export blocks.
+This is basic overview of the main Import-Export blocks.
 
 ```mermaid
 graph LR

doc/index.md

@@ -9,6 +9,6 @@ Documentation pages in order to read for a novice:
 * [Communication between Bridge, Client and Server](communication.md)
 * [Encryption](encryption.md)
 
-## Import-Export
+## Import-Export app
 
 * [Import-Export code](importexport.md)

internal/frontend/cli-ie/frontend.go

@@ -228,7 +228,7 @@ func (f *frontendCLI) Loop(credentialsError error) error {
 	}
 
 	f.Print(`
-Welcome to ProtonMail Import-Export interactive shell
+Welcome to ProtonMail Import-Export app interactive shell
 
 WARNING: The CLI is an experimental feature and does not yet cover all functionality.
 	`)

internal/frontend/cli-ie/system.go

@@ -22,7 +22,7 @@ import (
 )
 
 func (f *frontendCLI) restart(c *ishell.Context) {
-	if f.yesNoQuestion("Are you sure you want to restart the Import-Export") {
+	if f.yesNoQuestion("Are you sure you want to restart the Import-Export app") {
 		f.Println("Restarting the Import-Export app...")
 		f.appRestart = true
 		f.Stop()

internal/frontend/cli-ie/updates.go

@@ -47,7 +47,7 @@ func (f *frontendCLI) printLocalReleaseNotes(c *ishell.Context) {
 }
 
 func (f *frontendCLI) printReleaseNotes(versionInfo updates.VersionInfo) {
-	f.Println(bold("ProtonMail Import-Export "+versionInfo.Version), "\n")
+	f.Println(bold("ProtonMail Import-Export app "+versionInfo.Version), "\n")
 	if versionInfo.ReleaseNotes != "" {
 		f.Println(bold("Release Notes"))
 		f.Println(versionInfo.ReleaseNotes)

internal/frontend/cli-ie/utils.go

@@ -98,7 +98,7 @@ func (f *frontendCLI) notifyNeedUpgrade() {
 
 func (f *frontendCLI) notifyCredentialsError() {
 	// Print in 80-column width.
-	f.Println("ProtonMail Import-Export is not able to detect a supported password manager")
+	f.Println("ProtonMail Import-Export app is not able to detect a supported password manager")
 	f.Println("(pass, gnome-keyring). Please install and set up a supported password manager")
 	f.Println("and restart the application.")
 }

internal/frontend/qml/GuiIE.qml

@@ -234,7 +234,7 @@ Item {
         }
 
         onNotifyLogout : {
-            go.notifyBubble(0, qsTr("Account %1 has been disconnected. Please log in to continue to use the Import-Export with this account.").arg(accname) )
+            go.notifyBubble(0, qsTr("Account %1 has been disconnected. Please log in to continue to use the Import-Export app with this account.").arg(accname) )
         }
 
         onNotifyAddressChanged : {

internal/frontend/qml/ImportExportUI/DialogYesNo.qml

@@ -218,7 +218,7 @@ Dialog {
                 currentIndex : 0
                 title        : qsTr("Clear keychain", "title of page that displays during keychain clearing")
                 question     : qsTr("Are you sure you want to clear your keychain?", "displays during keychain clearing")
-                note         : qsTr("This will remove all accounts that you have added to the Import-Export tool.", "displays during keychain clearing")
+                note         : qsTr("This will remove all accounts that you have added to the Import-Export app.", "displays during keychain clearing")
                 answer       : qsTr("Clearing the keychain ...", "displays during keychain clearing")
             }
         },

internal/frontend/qml/ImportExportUI/HelpView.qml

@@ -83,7 +83,7 @@ Item {
                     color: Style.main.textDisabled
                     horizontalAlignment: Qt.AlignHCenter
                     font.family : Style.fontawesome.name
-                    text: "ProtonMail Import-Export Version "+go.getBackendVersion()+"\n"+Style.fa.copyright + " 2020 Proton Technologies AG"
+                    text: "ProtonMail Import-Export app Version "+go.getBackendVersion()+"\n"+Style.fa.copyright + " 2020 Proton Technologies AG"
                 }
             }