diff --git a/config/language-translations.php b/config/language-translations.php
index 07ae3f2f..9aa202c7 100644
--- a/config/language-translations.php
+++ b/config/language-translations.php
@@ -211,7 +211,6 @@ return [
         'bandwidth'                                           => 'Bandwidth',
         'storage'                                             => 'Storage',
         'flatFee'                                             => 'Flat Fee',
-        'member'                                              => 'Members',
         'feature_usage_desc_flatFee'                          => 'Price for the service.',
         'feature_usage_desc_bandwidth'                        => 'Data amount you transferred to/from your account.',
         'feature_usage_desc_storage'                          => 'Total storage amount you are using.',
@@ -751,5 +750,18 @@ return [
         'sharelink.copy_embed'                               => 'Copy Web Insert Code',
         'popup.move_into_team_disclaimer'                    => 'Your folder <b class="text-theme dark-text-theme">will be moved</b> into Team Folders section.',
         'actions.upload_folder'                              => 'Upload Folder',
+
+        // v2
+        'member'                                              => 'Members',
+
+        'request_for_upload'                     => '{name} is Asking You For Files',
+        'request_for_upload_success'             => 'Upload Request for {name} was Fulfilled Successfully',
+        'request_for_upload_expired'             => 'Upload Request Expired',
+        'automatically_uploads_for_file_request' => 'Your files will be uploaded automatically and after that, you can organize your files in folders.',
+        'request_for_upload_unavailable'         => 'This upload request is no longer available for uploading files.',
+        'closing_request_for_upload'             => 'Are you sure you uploaded all files you want for {name}?',
+        'closing_request_for_upload_warn'        => "You won't be able to upload any files here once again.",
+        'user_leave_message'                     => '{name} leave you a message',
+        'tell_you_are_done'                      => 'Tell {name} you are done!',
     ],
 ];
diff --git a/resources/js/components/FilesView/DesktopUploadRequestToolbar.vue b/resources/js/components/FilesView/DesktopUploadRequestToolbar.vue
index a6ea3fd6..81c2ed01 100644
--- a/resources/js/components/FilesView/DesktopUploadRequestToolbar.vue
+++ b/resources/js/components/FilesView/DesktopUploadRequestToolbar.vue
@@ -8,7 +8,7 @@
 				<!--I am Done-->
                 <div @click="uploadingDone" class="bg-theme-200 mr-6 flex cursor-pointer items-center rounded-lg py-1 pr-1 pl-4">
                     <b class="text-theme mr-3 text-sm leading-3">
-                        {{ $t('Tell {name} you are done!', {name: uploadRequest.data.relationships.user.data.attributes.name}) }}
+                        {{ $t('tell_you_are_done', {name: uploadRequest.data.relationships.user.data.attributes.name}) }}
                     </b>
 					<MemberAvatar
 						:member="uploadRequest.data.relationships.user"
@@ -122,8 +122,8 @@ export default {
     methods: {
         uploadingDone() {
 			events.$emit('confirm:open', {
-				title: this.$t('Are you sure you uploaded all files you want for {name}?', {name: this.uploadRequest.data.relationships.user.data.attributes.name}),
-				message: this.$t("You won't be able to upload any files here once again."),
+				title: this.$t('closing_request_for_upload', {name: this.uploadRequest.data.relationships.user.data.attributes.name}),
+				message: this.$t('closing_request_for_upload_warn'),
 				action: {
 					id: this.$router.currentRoute.params.token,
 					operation: 'close-upload-request',
diff --git a/resources/js/views/FileView/UploadRequestFiles.vue b/resources/js/views/FileView/UploadRequestFiles.vue
index cd8dba04..e9ad2c8d 100644
--- a/resources/js/views/FileView/UploadRequestFiles.vue
+++ b/resources/js/views/FileView/UploadRequestFiles.vue
@@ -89,7 +89,7 @@
 					:size="26"
 				/>
 				<b class="text-theme ml-2 text-sm">
-					{{ $t('Tell {name} you are done!', {name: userName}) }}
+					{{ $t('tell_you_are_done', {name: userName}) }}
 				</b>
 			</button>
 
@@ -143,7 +143,7 @@
 				</p>
 
 				<InfoBox v-if="uploadRequest.data.attributes.notes && uploadRequest.data.attributes.status === 'active'" class="max-w-[420px] mx-auto">
-					<b>{{ $t('{name} leave you a message', {name: userName}) }}: </b>
+					<b>{{ $t('user_leave_message', {name: userName}) }}: </b>
 					<p>{{ uploadRequest.data.attributes.notes }}</p>
 				</InfoBox>
 
@@ -206,18 +206,17 @@ export default {
 			return this.uploadRequest.data.relationships.user.data.attributes.name
 		},
 		emptyPageTitle() {
-			// Todo: add name into translation
 			return {
-				active: this.$t('{name} Request You for File Upload', {name: this.userName}),
-				filled: this.$t('Upload Request for {name} was Fulfilled Successfully', {name: this.userName}),
-				expired: this.$t('Upload Request Expired'),
+				active: this.$t('request_for_upload', {name: this.userName}),
+				filled: this.$t('request_for_upload_success', {name: this.userName}),
+				expired: this.$t('request_for_upload_expired'),
 			}[this.uploadRequest.data.attributes.status]
 		},
 		emptyPageDescription() {
 			return {
-				active: this.$t('Your files will be uploaded automatically and after that, you can organize your files in folders.'),
-				filled: this.$t('This upload request is no longer available for uploading files.'),
-				expired: this.$t('This upload request is no longer available for uploading files.'),
+				active: this.$t('automatically_uploads_for_file_request'),
+				filled: this.$t('request_for_upload_unavailable'),
+				expired: this.$t('request_for_upload_unavailable'),
 			}[this.uploadRequest.data.attributes.status]
 		}
 	},
@@ -229,8 +228,8 @@ export default {
 	methods: {
 		uploadingDone() {
 			events.$emit('confirm:open', {
-				title: this.$t('Are you sure you uploaded all files you want for {name}?', {name: this.userName}),
-				message: this.$t("You won't be able to upload any files here once again."),
+				title: this.$t('closing_request_for_upload', {name: this.userName}),
+				message: this.$t('closing_request_for_upload_warn'),
 				action: {
 					id: this.$router.currentRoute.params.token,
 					operation: 'close-upload-request',