diff --git a/src/ui/EditModal.ts b/src/ui/EditModal.ts
index 80f4a18..d26d520 100644
--- a/src/ui/EditModal.ts
+++ b/src/ui/EditModal.ts
@@ -93,7 +93,7 @@ export class EditModal extends SettingModal {
 
 	display(): void {
 		this.containerEl.addClass("edit-modal");
-		this.titleEl.setText('Edit Database');
+		this.titleEl.setText(i18nConfig.EditDatabase);
 
 		let { contentEl } = this;
 		contentEl.empty();
@@ -245,8 +245,8 @@ export class EditModal extends SettingModal {
 		}
 
 		new Setting(containerEl)
-			.setName("Add New Property")
-			.setDesc("Click to add a new property")
+			.setName(i18nConfig.AddNewProperty)
+			.setDesc(i18nConfig.AddNewPropertyDesc)
 			.addButton(button => {
 				return button
 					.setButtonText('Add')
diff --git a/src/ui/PreviewModal.ts b/src/ui/PreviewModal.ts
index 9c2ad2c..5db99b1 100644
--- a/src/ui/PreviewModal.ts
+++ b/src/ui/PreviewModal.ts
@@ -19,7 +19,7 @@ export class PreviewModal extends Modal {
 
 	display(): void {
 		this.containerEl.addClass('preview-modal')
-		this.titleEl.setText('Preview')
+		this.titleEl.setText(i18nConfig.Preview)
 
 		let { contentEl } = this;
 
@@ -27,21 +27,21 @@ export class PreviewModal extends Modal {
 
 		const dbFormatEl = new Setting(previewEl)
 		dbFormatEl
-			.setName('Database Format')
+			.setName(i18nConfig.DatabaseFormatLabel)
 			.addText(text => text
 				.setValue(this.dbDetails.format)
 				.setDisabled(true));
 
 		const dbFullEl = new Setting(previewEl)
 		dbFullEl
-			.setName('Database Full Name')
+			.setName(i18nConfig.DatabaseFullNameLabel)
 			.addText(text => text
 				.setValue(this.dbDetails.fullName)
 				.setDisabled(true));
 
 		const dbAbbrEl = new Setting(previewEl)
 		dbAbbrEl
-			.setName('Database Abbreviate Name')
+			.setName(i18nConfig.DatabaseAbbreviateNameLabel)
 			.addText(text => text
 				.setValue(this.dbDetails.abName)
 				.setDisabled(true));
@@ -49,12 +49,12 @@ export class PreviewModal extends Modal {
 
 		// Setting for toggle and copy buttons
 		new Setting(previewEl)
-			.setName('Notion API Key')
+			.setName(i18nConfig.NotionAPILabel)
 			.addExtraButton((button: ExtraButtonComponent) => {
 				let isApiKeyVisible = false;
 
 				return button
-					.setTooltip('Toggle API Key Visibility')
+					.setTooltip(i18nConfig.ToggleAPIKeyVisibility)
 					.setIcon('eye')
 					.onClick(() => {
 						isApiKeyVisible = !isApiKeyVisible;
@@ -73,11 +73,11 @@ export class PreviewModal extends Modal {
 		apiKeySetting
 			.addExtraButton((button: ExtraButtonComponent) => {
 				return button
-					.setTooltip('Copy API Key')
+					.setTooltip(i18nConfig.CopyAPIKey)
 					.setIcon('clipboard')
 					.onClick(() => {
 						navigator.clipboard.writeText(this.dbDetails.notionAPI)
-						new Notice('API Key copied to clipboard');
+						new Notice(i18nConfig.APIKeyCopied);
 					});
 			});
 
@@ -86,12 +86,12 @@ export class PreviewModal extends Modal {
 
 
 		new Setting(previewEl)
-			.setName('Database ID')
+			.setName(i18nConfig.DatabaseIDLabel)
 			.addExtraButton((button: ExtraButtonComponent) => {
 				let isDbIdVisible = false;
 
 				return button
-					.setTooltip('Toggle Database ID Visibility')
+					.setTooltip(i18nConfig.ToggleDatabaseIDVisibility)
 					.setIcon('eye')
 					.onClick(() => {
 
@@ -108,11 +108,11 @@ export class PreviewModal extends Modal {
 		dbIdSetting
 			.addExtraButton((button: ExtraButtonComponent) => {
 				return button
-					.setTooltip('Copy Database ID')
+					.setTooltip(i18nConfig.CopyDatabaseID)
 					.setIcon('clipboard')
 					.onClick(() => {
 						navigator.clipboard.writeText(this.dbDetails.databaseID)
-						new Notice('Database ID copied to clipboard');
+						new Notice(i18nConfig.DatabaseIDCopied);
 					});
 			});
 
diff --git a/src/ui/settingModal.ts b/src/ui/settingModal.ts
index b34c73d..017bf6b 100644
--- a/src/ui/settingModal.ts
+++ b/src/ui/settingModal.ts
@@ -56,7 +56,7 @@ export class SettingModal extends Modal {
 
 	display(): void {
 		this.containerEl.addClass("settings-modal");
-		this.titleEl.setText('Add new database');
+		this.titleEl.setText(i18nConfig.AddNewDatabaseModal);
 
 		// create the dropdown button to select the database format
 		let { contentEl } = this;
diff --git a/src/ui/settingTabs.ts b/src/ui/settingTabs.ts
index 023479f..b97f28d 100644
--- a/src/ui/settingTabs.ts
+++ b/src/ui/settingTabs.ts
@@ -123,11 +123,11 @@ export class ObsidianSettingTab extends PluginSettingTab {
 
 		// add new button
 		new Setting(containerEl)
-			.setName("Add New Database")
-			.setDesc("Add New Database")
+			.setName(i18nConfig.AddNewDatabase)
+			.setDesc(i18nConfig.AddNewDatabaseDesc)
 			.addButton((button: ButtonComponent): ButtonComponent => {
 				return button
-					.setTooltip("Add New Database")
+					.setTooltip(i18nConfig.AddNewDatabaseTooltip)
 					.setIcon("plus")
 					.onClick(async () => {
 						let modal = new SettingModal(this.app, this.plugin, this);
diff --git a/src/upload/uploadCommand.ts b/src/upload/uploadCommand.ts
index a4a1080..890672f 100644
--- a/src/upload/uploadCommand.ts
+++ b/src/upload/uploadCommand.ts
@@ -160,7 +160,7 @@ export async function uploadCommandGeneral(
 
 	const {markDownData, nowFile, cover, tags} = await getNowFileMarkdownContentGeneral(app, settings)
 
-	new Notice(`Start upload ${nowFile.basename}`);
+	new Notice(i18nConfig.StartUpload.replace('{filename}', nowFile.basename));
 	console.log(`Start upload ${nowFile.basename}`);
 
 	if (markDownData) {
@@ -237,7 +237,7 @@ export async function uploadCommandCustom(
 
 	const {markDownData, nowFile, cover, customValues} = await getNowFileMarkdownContentCustom(app, dbDetails)
 
-	new Notice(`Start upload ${nowFile.basename}`);
+	new Notice(i18nConfig.StartUpload.replace('{filename}', nowFile.basename));
 	console.log(`Start upload ${nowFile.basename}`);
 
 	if (markDownData) {