diff --git a/src/main/resources/messages_ar_AR.properties b/src/main/resources/messages_ar_AR.properties
index 7f9cd9cb..24129d2d 100644
--- a/src/main/resources/messages_ar_AR.properties
+++ b/src/main/resources/messages_ar_AR.properties
@@ -31,9 +31,6 @@ sizes.medium=Medium
 sizes.large=Large
 sizes.x-large=X-Large
 error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect
-##########################
-###  TODO: Translate   ###
-##########################
 delete=Delete
 username=Username
 password=Password
@@ -61,20 +58,14 @@ settings.downloadOption.1=\u0641\u062A\u062D \u0641\u064A \u0646\u0641\u0633 \u0
 settings.downloadOption.2=\u0641\u062A\u062D \u0641\u064A \u0646\u0627\u0641\u0630\u0629 \u062C\u062F\u064A\u062F\u0629
 settings.downloadOption.3=\u062A\u0646\u0632\u064A\u0644 \u0627\u0644\u0645\u0644\u0641
 settings.zipThreshold=\u0645\u0644\u0641\u0627\u062A \u0645\u0636\u063A\u0648\u0637\u0629 \u0639\u0646\u062F \u062A\u062C\u0627\u0648\u0632 \u0639\u062F\u062F \u0627\u0644\u0645\u0644\u0641\u0627\u062A \u0627\u0644\u062A\u064A \u062A\u0645 \u062A\u0646\u0632\u064A\u0644\u0647\u0627
-##########################
-###  TODO: Translate   ###
-##########################
 settings.signOut=Sign Out
 settings.accountSettings=Account Settings
 
-##########################
-###  TODO: Translate   ###
-##########################
 account.title=Account Settings
 account.accountSettings=Account Settings
 account.adminSettings=Admin Settings - View and Add Users
 account.userControlSettings=User Control Settings
-account.changeUsername=New Username
+account.changeUsername=Change Username
 account.changeUsername=Change Username
 account.password=Confirmation Password
 account.oldPassword=Old password
@@ -91,9 +82,6 @@ account.syncToBrowser=Sync Account -> Browser
 account.syncToAccount=Sync Account <- Browser
 
 
-##########################
-###  TODO: Translate   ###
-##########################
 adminUserSettings.title=User Control Settings
 adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
@@ -386,6 +374,12 @@ addPageNumbers.selectText.3=Position
 addPageNumbers.selectText.4=Starting Number
 addPageNumbers.selectText.5=Pages to Number
 addPageNumbers.selectText.6=Custom Text
+##########################
+###  TODO: Translate   ###
+##########################
+addPageNumbers.customTextDesc=Custom Text
+addPageNumbers.numberPagesDesc=Which pages to number, default 'all', also accepts 1-5 or 2,5,9 etc
+addPageNumbers.customNumberDesc=Defaults to {n}, also accepts 'Page {n} of {total}', 'Text-{n}', '{filename}-{n}
 addPageNumbers.submit=Add Page Numbers
 
 
@@ -571,9 +565,6 @@ addImage.submit=إضافة صورة
 #merge
 merge.title=دمج
 merge.header=دمج ملفات PDF متعددة (2+)
-##########################
-###  TODO: Translate   ###
-##########################
 merge.sortByName=Sort by name
 merge.sortByDate=Sort by date
 merge.submit=دمج
@@ -676,9 +667,6 @@ watermark.selectText.4=دوران (0-360):
 watermark.selectText.5=widthSpacer (مسافة بين كل علامة مائية أفقيًا):
 watermark.selectText.6=heightSpacer (مسافة بين كل علامة مائية عموديًا):
 watermark.selectText.7=\u0627\u0644\u062A\u0639\u062A\u064A\u0645 (0\u066A - 100\u066A):
-##########################
-###  TODO: Translate   ###
-##########################
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
 watermark.submit=إضافة علامة مائية
diff --git a/src/main/resources/messages_ca_CA.properties b/src/main/resources/messages_ca_CA.properties
index 68d8b466..6319e5a0 100644
--- a/src/main/resources/messages_ca_CA.properties
+++ b/src/main/resources/messages_ca_CA.properties
@@ -31,9 +31,6 @@ sizes.medium=Medium
 sizes.large=Large
 sizes.x-large=X-Large
 error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect
-##########################
-###  TODO: Translate   ###
-##########################
 delete=Delete
 username=Username
 password=Password
@@ -61,20 +58,14 @@ settings.downloadOption.1=Obre mateixa finestra
 settings.downloadOption.2=Obre mateixa finestra
 settings.downloadOption.3=Descarrega Arxiu
 settings.zipThreshold=Comprimiu els fitxers quan el nombre de fitxers baixats superi
-##########################
-###  TODO: Translate   ###
-##########################
 settings.signOut=Sign Out
 settings.accountSettings=Account Settings
 
-##########################
-###  TODO: Translate   ###
-##########################
 account.title=Account Settings
 account.accountSettings=Account Settings
 account.adminSettings=Admin Settings - View and Add Users
 account.userControlSettings=User Control Settings
-account.changeUsername=New Username
+account.changeUsername=Change Username
 account.changeUsername=Change Username
 account.password=Confirmation Password
 account.oldPassword=Old password
@@ -91,9 +82,6 @@ account.syncToBrowser=Sync Account -> Browser
 account.syncToAccount=Sync Account <- Browser
 
 
-##########################
-###  TODO: Translate   ###
-##########################
 adminUserSettings.title=User Control Settings
 adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
@@ -386,6 +374,12 @@ addPageNumbers.selectText.3=Position
 addPageNumbers.selectText.4=Starting Number
 addPageNumbers.selectText.5=Pages to Number
 addPageNumbers.selectText.6=Custom Text
+##########################
+###  TODO: Translate   ###
+##########################
+addPageNumbers.customTextDesc=Custom Text
+addPageNumbers.numberPagesDesc=Which pages to number, default 'all', also accepts 1-5 or 2,5,9 etc
+addPageNumbers.customNumberDesc=Defaults to {n}, also accepts 'Page {n} of {total}', 'Text-{n}', '{filename}-{n}
 addPageNumbers.submit=Add Page Numbers
 
 
@@ -571,9 +565,6 @@ addImage.submit=Afegir Imatge
 #merge
 merge.title=Fusiona
 merge.header=Fusiona múltiples PDFs (2+)
-##########################
-###  TODO: Translate   ###
-##########################
 merge.sortByName=Sort by name
 merge.sortByDate=Sort by date
 merge.submit=Fusiona
@@ -676,9 +667,6 @@ watermark.selectText.4=Rotació (0-360):
 watermark.selectText.5=separació d'amplada (Espai horitzontal entre cada Marca d'Aigua):
 watermark.selectText.6=separació d'alçada (Espai vertical entre cada Marca d'Aigua):
 watermark.selectText.7=Opacitat (0% - 100%):
-##########################
-###  TODO: Translate   ###
-##########################
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
 watermark.submit=Afegir Marca d'Aigua
diff --git a/src/main/resources/messages_de_DE.properties b/src/main/resources/messages_de_DE.properties
index 35043038..11cf141d 100644
--- a/src/main/resources/messages_de_DE.properties
+++ b/src/main/resources/messages_de_DE.properties
@@ -31,9 +31,6 @@ sizes.medium=Medium
 sizes.large=Large
 sizes.x-large=X-Large
 error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect
-##########################
-###  TODO: Translate   ###
-##########################
 delete=Delete
 username=Username
 password=Password
@@ -61,20 +58,14 @@ settings.downloadOption.1=Im selben Fenster öffnen
 settings.downloadOption.2=In neuem Fenster öffnen
 settings.downloadOption.3=Datei herunterladen
 settings.zipThreshold=Dateien komprimieren, wenn die Anzahl der heruntergeladenen Dateien überschritten wird
-##########################
-###  TODO: Translate   ###
-##########################
 settings.signOut=Sign Out
 settings.accountSettings=Account Settings
 
-##########################
-###  TODO: Translate   ###
-##########################
 account.title=Account Settings
 account.accountSettings=Account Settings
 account.adminSettings=Admin Settings - View and Add Users
 account.userControlSettings=User Control Settings
-account.changeUsername=New Username
+account.changeUsername=Change Username
 account.changeUsername=Change Username
 account.password=Confirmation Password
 account.oldPassword=Old password
@@ -91,9 +82,6 @@ account.syncToBrowser=Sync Account -> Browser
 account.syncToAccount=Sync Account <- Browser
 
 
-##########################
-###  TODO: Translate   ###
-##########################
 adminUserSettings.title=User Control Settings
 adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
@@ -386,6 +374,12 @@ addPageNumbers.selectText.3=Position
 addPageNumbers.selectText.4=Starting Number
 addPageNumbers.selectText.5=Pages to Number
 addPageNumbers.selectText.6=Custom Text
+##########################
+###  TODO: Translate   ###
+##########################
+addPageNumbers.customTextDesc=Custom Text
+addPageNumbers.numberPagesDesc=Which pages to number, default 'all', also accepts 1-5 or 2,5,9 etc
+addPageNumbers.customNumberDesc=Defaults to {n}, also accepts 'Page {n} of {total}', 'Text-{n}', '{filename}-{n}
 addPageNumbers.submit=Add Page Numbers
 
 
@@ -571,9 +565,6 @@ addImage.submit=Bild hinzufügen
 #merge
 merge.title=Zusammenführen
 merge.header=Mehrere PDFs zusammenführen (2+)
-##########################
-###  TODO: Translate   ###
-##########################
 merge.sortByName=Sort by name
 merge.sortByDate=Sort by date
 merge.submit=Zusammenführen
@@ -676,9 +667,6 @@ watermark.selectText.4=Drehung (0-360):
 watermark.selectText.5=breiteSpacer (horizontaler Abstand zwischen den einzelnen Wasserzeichen):
 watermark.selectText.6=höheSpacer (vertikaler Abstand zwischen den einzelnen Wasserzeichen):
 watermark.selectText.7=Deckkraft (0% - 100 %):
-##########################
-###  TODO: Translate   ###
-##########################
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
 watermark.submit=Wasserzeichen hinzufügen
diff --git a/src/main/resources/messages_en_US.properties b/src/main/resources/messages_en_US.properties
index 778629bf..cf228aad 100644
--- a/src/main/resources/messages_en_US.properties
+++ b/src/main/resources/messages_en_US.properties
@@ -31,9 +31,6 @@ sizes.medium=Medium
 sizes.large=Large
 sizes.x-large=X-Large
 error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect
-##########################
-###  TODO: Translate   ###
-##########################
 delete=Delete
 username=Username
 password=Password
@@ -61,20 +58,14 @@ settings.downloadOption.1=Open in same window
 settings.downloadOption.2=Open in new window
 settings.downloadOption.3=Download file
 settings.zipThreshold=Zip files when the number of downloaded files exceeds
-##########################
-###  TODO: Translate   ###
-##########################
 settings.signOut=Sign Out
 settings.accountSettings=Account Settings
 
-##########################
-###  TODO: Translate   ###
-##########################
 account.title=Account Settings
 account.accountSettings=Account Settings
 account.adminSettings=Admin Settings - View and Add Users
 account.userControlSettings=User Control Settings
-account.changeUsername=New Username
+account.changeUsername=Change Username
 account.changeUsername=Change Username
 account.password=Confirmation Password
 account.oldPassword=Old password
@@ -91,9 +82,6 @@ account.syncToBrowser=Sync Account -> Browser
 account.syncToAccount=Sync Account <- Browser
 
 
-##########################
-###  TODO: Translate   ###
-##########################
 adminUserSettings.title=User Control Settings
 adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
@@ -386,6 +374,12 @@ addPageNumbers.selectText.3=Position
 addPageNumbers.selectText.4=Starting Number
 addPageNumbers.selectText.5=Pages to Number
 addPageNumbers.selectText.6=Custom Text
+##########################
+###  TODO: Translate   ###
+##########################
+addPageNumbers.customTextDesc=Custom Text
+addPageNumbers.numberPagesDesc=Which pages to number, default 'all', also accepts 1-5 or 2,5,9 etc
+addPageNumbers.customNumberDesc=Defaults to {n}, also accepts 'Page {n} of {total}', 'Text-{n}', '{filename}-{n}
 addPageNumbers.submit=Add Page Numbers
 
 
@@ -571,9 +565,6 @@ addImage.submit=Add image
 #merge
 merge.title=Merge
 merge.header=Merge multiple PDFs (2+)
-##########################
-###  TODO: Translate   ###
-##########################
 merge.sortByName=Sort by name
 merge.sortByDate=Sort by date
 merge.submit=Merge
@@ -676,9 +667,6 @@ watermark.selectText.4=Rotation (0-360):
 watermark.selectText.5=widthSpacer (Space between each watermark horizontally):
 watermark.selectText.6=heightSpacer (Space between each watermark vertically):
 watermark.selectText.7=Opacity (0% - 100%):
-##########################
-###  TODO: Translate   ###
-##########################
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
 watermark.submit=Add Watermark
diff --git a/src/main/resources/messages_es_ES.properties b/src/main/resources/messages_es_ES.properties
index 6199dad7..35065a1a 100644
--- a/src/main/resources/messages_es_ES.properties
+++ b/src/main/resources/messages_es_ES.properties
@@ -31,9 +31,6 @@ sizes.medium=Mediano
 sizes.large=Grande
 sizes.x-large=Extra grande
 error.pdfPassword=El documento PDF está protegido con contraseña y no se ha proporcionado o es incorrecta
-##########################
-###  TODO: Translate   ###
-##########################
 delete=Delete
 username=Username
 password=Password
@@ -61,20 +58,14 @@ settings.downloadOption.1=Abrir en la misma ventana
 settings.downloadOption.2=Abrir en una nueva ventana
 settings.downloadOption.3=Descargar el fichero
 settings.zipThreshold=Ficheros ZIP cuando excede el número de ficheros descargados
-##########################
-###  TODO: Translate   ###
-##########################
 settings.signOut=Sign Out
 settings.accountSettings=Account Settings
 
-##########################
-###  TODO: Translate   ###
-##########################
 account.title=Account Settings
 account.accountSettings=Account Settings
 account.adminSettings=Admin Settings - View and Add Users
 account.userControlSettings=User Control Settings
-account.changeUsername=New Username
+account.changeUsername=Change Username
 account.changeUsername=Change Username
 account.password=Confirmation Password
 account.oldPassword=Old password
@@ -91,9 +82,6 @@ account.syncToBrowser=Sync Account -> Browser
 account.syncToAccount=Sync Account <- Browser
 
 
-##########################
-###  TODO: Translate   ###
-##########################
 adminUserSettings.title=User Control Settings
 adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
@@ -386,6 +374,12 @@ addPageNumbers.selectText.3=Posición
 addPageNumbers.selectText.4=Número de inicio
 addPageNumbers.selectText.5=Páginas a numerar
 addPageNumbers.selectText.6=Texto personalizado
+##########################
+###  TODO: Translate   ###
+##########################
+addPageNumbers.customTextDesc=Custom Text
+addPageNumbers.numberPagesDesc=Which pages to number, default 'all', also accepts 1-5 or 2,5,9 etc
+addPageNumbers.customNumberDesc=Defaults to {n}, also accepts 'Page {n} of {total}', 'Text-{n}', '{filename}-{n}
 addPageNumbers.submit=Añadir Números de Página
 
 
@@ -571,9 +565,6 @@ addImage.submit=Añadir imagen
 #merge
 merge.title=Unir
 merge.header=Unir múltiples PDFs (2+)
-##########################
-###  TODO: Translate   ###
-##########################
 merge.sortByName=Sort by name
 merge.sortByDate=Sort by date
 merge.submit=Unir
@@ -676,9 +667,6 @@ watermark.selectText.4=Rotación (0-360):
 watermark.selectText.5=Ancho (Espacio entre cada marca de agua horizontalmente):
 watermark.selectText.6=Alto (Espacio entre cada marca de agua verticalmente):
 watermark.selectText.7=Opacidad (0% - 100%):
-##########################
-###  TODO: Translate   ###
-##########################
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
 watermark.submit=Añadir marca de agua
diff --git a/src/main/resources/messages_eu_ES.properties b/src/main/resources/messages_eu_ES.properties
index 47aa1990..22703f65 100644
--- a/src/main/resources/messages_eu_ES.properties
+++ b/src/main/resources/messages_eu_ES.properties
@@ -31,9 +31,6 @@ sizes.medium=Medium
 sizes.large=Large
 sizes.x-large=X-Large
 error.pdfPassword=PDF dokumentua pasahitzarekin babestuta dago eta pasahitza ez da sartu edo akastuna da
-##########################
-###  TODO: Translate   ###
-##########################
 delete=Delete
 username=Username
 password=Password
@@ -61,20 +58,14 @@ settings.downloadOption.1=Ireki leiho berean
 settings.downloadOption.2=Ireki leiho berrian
 settings.downloadOption.3=Deskargatu fitxategia
 settings.zipThreshold=ZIP fitxategiak deskargatutako fitxategi kopurua gainditzen denean
-##########################
-###  TODO: Translate   ###
-##########################
 settings.signOut=Sign Out
 settings.accountSettings=Account Settings
 
-##########################
-###  TODO: Translate   ###
-##########################
 account.title=Account Settings
 account.accountSettings=Account Settings
 account.adminSettings=Admin Settings - View and Add Users
 account.userControlSettings=User Control Settings
-account.changeUsername=New Username
+account.changeUsername=Change Username
 account.changeUsername=Change Username
 account.password=Confirmation Password
 account.oldPassword=Old password
@@ -91,9 +82,6 @@ account.syncToBrowser=Sync Account -> Browser
 account.syncToAccount=Sync Account <- Browser
 
 
-##########################
-###  TODO: Translate   ###
-##########################
 adminUserSettings.title=User Control Settings
 adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
@@ -386,6 +374,12 @@ addPageNumbers.selectText.3=Position
 addPageNumbers.selectText.4=Starting Number
 addPageNumbers.selectText.5=Pages to Number
 addPageNumbers.selectText.6=Custom Text
+##########################
+###  TODO: Translate   ###
+##########################
+addPageNumbers.customTextDesc=Custom Text
+addPageNumbers.numberPagesDesc=Which pages to number, default 'all', also accepts 1-5 or 2,5,9 etc
+addPageNumbers.customNumberDesc=Defaults to {n}, also accepts 'Page {n} of {total}', 'Text-{n}', '{filename}-{n}
 addPageNumbers.submit=Add Page Numbers
 
 
@@ -571,9 +565,6 @@ addImage.submit=Gehitu irudia
 #merge
 merge.title=Elkartu
 merge.header=Elkartu zenbait PDF  (2+)
-##########################
-###  TODO: Translate   ###
-##########################
 merge.sortByName=Sort by name
 merge.sortByDate=Sort by date
 merge.submit=Elkartu
@@ -676,9 +667,6 @@ watermark.selectText.4=Errotazioa (0-360):
 watermark.selectText.5=Zabalera (ur-marka bakoitzaren arteko espazioa horizontalean):
 watermark.selectText.6=Altuera (ur-marka bakoitzaren arteko espazioa bertikalean):
 watermark.selectText.7=Opakutasuna (0% - 100%):
-##########################
-###  TODO: Translate   ###
-##########################
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
 watermark.submit=Gehitu ur-marka
diff --git a/src/main/resources/messages_fr_FR.properties b/src/main/resources/messages_fr_FR.properties
index d35a801d..521bd784 100644
--- a/src/main/resources/messages_fr_FR.properties
+++ b/src/main/resources/messages_fr_FR.properties
@@ -31,9 +31,6 @@ sizes.medium=Moyen
 sizes.large=Grand
 sizes.x-large=Très grand
 error.pdfPassword=Le document PDF est protégé par un mot de passe et le mot de passe n\u2019a pas été fourni ou était incorrect
-##########################
-###  TODO: Translate   ###
-##########################
 delete=Delete
 username=Username
 password=Password
@@ -61,20 +58,14 @@ settings.downloadOption.1=Ouvrir dans la même fenêtre
 settings.downloadOption.2=Ouvrir dans une nouvelle fenêtre
 settings.downloadOption.3=Télécharger le fichier
 settings.zipThreshold=Compresser les fichiers en ZIP lorsque le nombre de fichiers téléchargés dépasse
-##########################
-###  TODO: Translate   ###
-##########################
 settings.signOut=Sign Out
 settings.accountSettings=Account Settings
 
-##########################
-###  TODO: Translate   ###
-##########################
 account.title=Account Settings
 account.accountSettings=Account Settings
 account.adminSettings=Admin Settings - View and Add Users
 account.userControlSettings=User Control Settings
-account.changeUsername=New Username
+account.changeUsername=Change Username
 account.changeUsername=Change Username
 account.password=Confirmation Password
 account.oldPassword=Old password
@@ -91,9 +82,6 @@ account.syncToBrowser=Sync Account -> Browser
 account.syncToAccount=Sync Account <- Browser
 
 
-##########################
-###  TODO: Translate   ###
-##########################
 adminUserSettings.title=User Control Settings
 adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
@@ -330,9 +318,6 @@ pdfToSinglePage.submit=Convertir en une seule page
 
 
 #pageExtracter
-##########################
-###  TODO: Translate   ###
-##########################
 pageExtracter.title=Extract Pages
 pageExtracter.header=Extract Pages
 pageExtracter.submit=Extract
@@ -389,6 +374,12 @@ addPageNumbers.selectText.3=Position
 addPageNumbers.selectText.4=Numéro de départ
 addPageNumbers.selectText.5=Pages à numéroter
 addPageNumbers.selectText.6=Texte personnalisé
+##########################
+###  TODO: Translate   ###
+##########################
+addPageNumbers.customTextDesc=Custom Text
+addPageNumbers.numberPagesDesc=Which pages to number, default 'all', also accepts 1-5 or 2,5,9 etc
+addPageNumbers.customNumberDesc=Defaults to {n}, also accepts 'Page {n} of {total}', 'Text-{n}', '{filename}-{n}
 addPageNumbers.submit=Ajouter les numéros de page
 
 
@@ -574,9 +565,6 @@ addImage.submit=Ajouter une image
 #merge
 merge.title=Fusionner
 merge.header=Fusionner plusieurs PDF
-##########################
-###  TODO: Translate   ###
-##########################
 merge.sortByName=Sort by name
 merge.sortByDate=Sort by date
 merge.submit=Fusionner
@@ -594,9 +582,6 @@ multiTool.header=Outil multifonction PDF
 
 
 #pageRemover
-##########################
-###  TODO: Translate   ###
-##########################
 pageRemover.title=Page Remover
 pageRemover.header=PDF Page remover
 pageRemover.pagesToDelete=Pages to delete (Enter a comma-separated list of page numbers) :
@@ -733,9 +718,6 @@ changeMetadata.submit=Modifier
 
 
 #xlsToPdf
-##########################
-###  TODO: Translate   ###
-##########################
 xlsToPdf.title=Excel to PDF
 xlsToPdf.header=Excel to PDF
 xlsToPdf.selectText.1=Select XLS or XLSX Excel sheet to convert
diff --git a/src/main/resources/messages_it_IT.properties b/src/main/resources/messages_it_IT.properties
index 219a3685..17f06989 100644
--- a/src/main/resources/messages_it_IT.properties
+++ b/src/main/resources/messages_it_IT.properties
@@ -31,9 +31,6 @@ sizes.medium=Medium
 sizes.large=Large
 sizes.x-large=X-Large
 error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect
-##########################
-###  TODO: Translate   ###
-##########################
 delete=Delete
 username=Username
 password=Password
@@ -61,20 +58,14 @@ settings.downloadOption.1=Apri in questa finestra
 settings.downloadOption.2=Apri in una nuova finestra
 settings.downloadOption.3=Scarica file
 settings.zipThreshold=Comprimi file in .zip quando il numero di download supera
-##########################
-###  TODO: Translate   ###
-##########################
 settings.signOut=Sign Out
 settings.accountSettings=Account Settings
 
-##########################
-###  TODO: Translate   ###
-##########################
 account.title=Account Settings
 account.accountSettings=Account Settings
 account.adminSettings=Admin Settings - View and Add Users
 account.userControlSettings=User Control Settings
-account.changeUsername=New Username
+account.changeUsername=Change Username
 account.changeUsername=Change Username
 account.password=Confirmation Password
 account.oldPassword=Old password
@@ -91,9 +82,6 @@ account.syncToBrowser=Sync Account -> Browser
 account.syncToAccount=Sync Account <- Browser
 
 
-##########################
-###  TODO: Translate   ###
-##########################
 adminUserSettings.title=User Control Settings
 adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
@@ -386,6 +374,12 @@ addPageNumbers.selectText.3=Position
 addPageNumbers.selectText.4=Starting Number
 addPageNumbers.selectText.5=Pages to Number
 addPageNumbers.selectText.6=Custom Text
+##########################
+###  TODO: Translate   ###
+##########################
+addPageNumbers.customTextDesc=Custom Text
+addPageNumbers.numberPagesDesc=Which pages to number, default 'all', also accepts 1-5 or 2,5,9 etc
+addPageNumbers.customNumberDesc=Defaults to {n}, also accepts 'Page {n} of {total}', 'Text-{n}', '{filename}-{n}
 addPageNumbers.submit=Add Page Numbers
 
 
@@ -571,9 +565,6 @@ addImage.submit=Aggiungi immagine
 #merge
 merge.title=Unisci
 merge.header=Unisci 2 o più PDF
-##########################
-###  TODO: Translate   ###
-##########################
 merge.sortByName=Sort by name
 merge.sortByDate=Sort by date
 merge.submit=Unisci
@@ -676,9 +667,6 @@ watermark.selectText.4=Rotazione (0-360):
 watermark.selectText.5=spazio orizzontale (tra ogni filigrana):
 watermark.selectText.6=spazio verticale (tra ogni filigrana):
 watermark.selectText.7=Opacità (0% - 100%):
-##########################
-###  TODO: Translate   ###
-##########################
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
 watermark.submit=Aggiungi Filigrana
diff --git a/src/main/resources/messages_ja_JP.properties b/src/main/resources/messages_ja_JP.properties
index 5847a5f6..534523c8 100644
--- a/src/main/resources/messages_ja_JP.properties
+++ b/src/main/resources/messages_ja_JP.properties
@@ -31,9 +31,6 @@ sizes.medium=Medium
 sizes.large=Large
 sizes.x-large=X-Large
 error.pdfPassword=PDFにパスワードが設定されてますが、パスワードが入力されてないか間違ってます。
-##########################
-###  TODO: Translate   ###
-##########################
 delete=Delete
 username=Username
 password=Password
@@ -61,20 +58,14 @@ settings.downloadOption.1=同じウィンドウで開く
 settings.downloadOption.2=新しいウィンドウで開く
 settings.downloadOption.3=ファイルをダウンロード
 settings.zipThreshold=このファイル数を超えたときにファイルを圧縮する
-##########################
-###  TODO: Translate   ###
-##########################
 settings.signOut=Sign Out
 settings.accountSettings=Account Settings
 
-##########################
-###  TODO: Translate   ###
-##########################
 account.title=Account Settings
 account.accountSettings=Account Settings
 account.adminSettings=Admin Settings - View and Add Users
 account.userControlSettings=User Control Settings
-account.changeUsername=New Username
+account.changeUsername=Change Username
 account.changeUsername=Change Username
 account.password=Confirmation Password
 account.oldPassword=Old password
@@ -91,9 +82,6 @@ account.syncToBrowser=Sync Account -> Browser
 account.syncToAccount=Sync Account <- Browser
 
 
-##########################
-###  TODO: Translate   ###
-##########################
 adminUserSettings.title=User Control Settings
 adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
@@ -386,6 +374,12 @@ addPageNumbers.selectText.3=Position
 addPageNumbers.selectText.4=Starting Number
 addPageNumbers.selectText.5=Pages to Number
 addPageNumbers.selectText.6=Custom Text
+##########################
+###  TODO: Translate   ###
+##########################
+addPageNumbers.customTextDesc=Custom Text
+addPageNumbers.numberPagesDesc=Which pages to number, default 'all', also accepts 1-5 or 2,5,9 etc
+addPageNumbers.customNumberDesc=Defaults to {n}, also accepts 'Page {n} of {total}', 'Text-{n}', '{filename}-{n}
 addPageNumbers.submit=Add Page Numbers
 
 
@@ -571,9 +565,6 @@ addImage.submit=画像の追加
 #merge
 merge.title=結合
 merge.header=複数のPDFを結合 (2ファイル以上)
-##########################
-###  TODO: Translate   ###
-##########################
 merge.sortByName=Sort by name
 merge.sortByDate=Sort by date
 merge.submit=結合
@@ -676,9 +667,6 @@ watermark.selectText.4=回転 (0-360):
 watermark.selectText.5=幅スペース (各透かし間の水平方向のスペース):
 watermark.selectText.6=高さスペース (各透かし間の垂直方向のスペース):
 watermark.selectText.7=不透明度 (0% - 100%):
-##########################
-###  TODO: Translate   ###
-##########################
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
 watermark.submit=透かしを追加
diff --git a/src/main/resources/messages_ko_KR.properties b/src/main/resources/messages_ko_KR.properties
index 889929f8..2ca0e8e1 100644
--- a/src/main/resources/messages_ko_KR.properties
+++ b/src/main/resources/messages_ko_KR.properties
@@ -31,9 +31,6 @@ sizes.medium=Medium
 sizes.large=Large
 sizes.x-large=X-Large
 error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect
-##########################
-###  TODO: Translate   ###
-##########################
 delete=Delete
 username=Username
 password=Password
@@ -61,20 +58,14 @@ settings.downloadOption.1=현재 창에서 열기
 settings.downloadOption.2=새 창에서 열기
 settings.downloadOption.3=다운로드
 settings.zipThreshold=다운로드한 파일 수가 초과된 경우 파일 압축하기
-##########################
-###  TODO: Translate   ###
-##########################
 settings.signOut=Sign Out
 settings.accountSettings=Account Settings
 
-##########################
-###  TODO: Translate   ###
-##########################
 account.title=Account Settings
 account.accountSettings=Account Settings
 account.adminSettings=Admin Settings - View and Add Users
 account.userControlSettings=User Control Settings
-account.changeUsername=New Username
+account.changeUsername=Change Username
 account.changeUsername=Change Username
 account.password=Confirmation Password
 account.oldPassword=Old password
@@ -91,9 +82,6 @@ account.syncToBrowser=Sync Account -> Browser
 account.syncToAccount=Sync Account <- Browser
 
 
-##########################
-###  TODO: Translate   ###
-##########################
 adminUserSettings.title=User Control Settings
 adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
@@ -386,6 +374,12 @@ addPageNumbers.selectText.3=Position
 addPageNumbers.selectText.4=Starting Number
 addPageNumbers.selectText.5=Pages to Number
 addPageNumbers.selectText.6=Custom Text
+##########################
+###  TODO: Translate   ###
+##########################
+addPageNumbers.customTextDesc=Custom Text
+addPageNumbers.numberPagesDesc=Which pages to number, default 'all', also accepts 1-5 or 2,5,9 etc
+addPageNumbers.customNumberDesc=Defaults to {n}, also accepts 'Page {n} of {total}', 'Text-{n}', '{filename}-{n}
 addPageNumbers.submit=Add Page Numbers
 
 
@@ -571,9 +565,6 @@ addImage.submit=이미지 추가
 #merge
 merge.title=병합
 merge.header=여러 개의 PDF 병합 (2개 이상)
-##########################
-###  TODO: Translate   ###
-##########################
 merge.sortByName=Sort by name
 merge.sortByDate=Sort by date
 merge.submit=병합
@@ -676,9 +667,6 @@ watermark.selectText.4=회전 각도 (0-360):
 watermark.selectText.5=가로 간격 (각 워터마크 사이의 가로 공간):
 watermark.selectText.6=세로 간격 (각 워터마크 사이의 세로 공간):
 watermark.selectText.7=투명도 (0% - 100%):
-##########################
-###  TODO: Translate   ###
-##########################
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
 watermark.submit=워터마크 추가
diff --git a/src/main/resources/messages_nl_NL.properties b/src/main/resources/messages_nl_NL.properties
index 13fc2702..fae05b89 100644
--- a/src/main/resources/messages_nl_NL.properties
+++ b/src/main/resources/messages_nl_NL.properties
@@ -1,7 +1,7 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr = left to right, rtl = right to left)
+# the direction that the language is written (ltr=left to right, rtl = right to left)
 language.direction=ltr
 
 pdfPrompt=Selecteer PDF(s)
@@ -65,7 +65,7 @@ account.title=Account instellingen
 account.accountSettings=Account instellingen
 account.adminSettings=Beheerdersinstellingen - Gebruikers bekijken en toevoegen
 account.userControlSettings=Gebruikerscontrole instellingen
-account.changeUsername=Nieuwe gebruikersnaam
+account.changeUsername=Wijzig gebruikersnaam
 account.changeUsername=Wijzig gebruikersnaam
 account.password=Bevestigingswachtwoord
 account.oldPassword=Oud wachtwoord
@@ -374,6 +374,12 @@ addPageNumbers.selectText.3=Positie
 addPageNumbers.selectText.4=Startnummer
 addPageNumbers.selectText.5=Pagina''s om te nummeren
 addPageNumbers.selectText.6=Aangepaste tekst
+##########################
+###  TODO: Translate   ###
+##########################
+addPageNumbers.customTextDesc=Custom Text
+addPageNumbers.numberPagesDesc=Which pages to number, default 'all', also accepts 1-5 or 2,5,9 etc
+addPageNumbers.customNumberDesc=Defaults to {n}, also accepts 'Page {n} of {total}', 'Text-{n}', '{filename}-{n}
 addPageNumbers.submit=Paginanummers toevoegen
 
 
@@ -500,7 +506,7 @@ ScannerImageSplit.selectText.8=Stelt de minimale contour oppervlakte drempel in
 ScannerImageSplit.selectText.9=Randgrootte:
 ScannerImageSplit.selectText.10=Stelt de grootte van de toegevoegde en verwijderde rand in om witte randen in de uitvoer te voorkomen (standaard: 1).
 
-
+                            
 #OCR
 ocr.title=OCR / Scan opruimen
 ocr.header=Scans opruimen / OCR (Optical Character Recognition)
@@ -613,8 +619,8 @@ imageToPDF.selectText.2=PDF automatisch draaien
 imageToPDF.selectText.3=Meervoudige bestandslogica (Alleen ingeschakeld bij werken met meerdere afbeeldingen)
 imageToPDF.selectText.4=Voeg samen in één PDF
 imageToPDF.selectText.5=Zet om naar afzonderlijke PDF''s
-
-
+    
+                                   
 #pdfToImage
 pdfToImage.title=PDF naar afbeelding
 pdfToImage.header=PDF naar afbeelding
@@ -692,7 +698,7 @@ removePassword.submit=Verwijderen
 
 
 #changeMetadata
-changeMetadata.title=Metadata wijzigen
+changeMetadata.title=Titel:
 changeMetadata.header=Metadata wijzigen
 changeMetadata.selectText.1=Pas de variabelen aan die je wilt wijzigen
 changeMetadata.selectText.2=Verwijder alle metadata
diff --git a/src/main/resources/messages_pl_PL.properties b/src/main/resources/messages_pl_PL.properties
index a386b8dd..d327b9e7 100644
--- a/src/main/resources/messages_pl_PL.properties
+++ b/src/main/resources/messages_pl_PL.properties
@@ -31,9 +31,6 @@ sizes.medium=Medium
 sizes.large=Large
 sizes.x-large=X-Large
 error.pdfPassword=Dokument PDF jest zabezpieczony hasłem, musisz podać prawidłowe hasło.
-##########################
-###  TODO: Translate   ###
-##########################
 delete=Delete
 username=Username
 password=Password
@@ -61,20 +58,14 @@ settings.downloadOption.1=Otwórz w tym samym oknie
 settings.downloadOption.2=Otwórz w nowym oknie
 settings.downloadOption.3=Pobierz plik
 settings.zipThreshold=Spakuj pliki, gdy liczba pobranych plików przekroczy
-##########################
-###  TODO: Translate   ###
-##########################
 settings.signOut=Sign Out
 settings.accountSettings=Account Settings
 
-##########################
-###  TODO: Translate   ###
-##########################
 account.title=Account Settings
 account.accountSettings=Account Settings
 account.adminSettings=Admin Settings - View and Add Users
 account.userControlSettings=User Control Settings
-account.changeUsername=New Username
+account.changeUsername=Change Username
 account.changeUsername=Change Username
 account.password=Confirmation Password
 account.oldPassword=Old password
@@ -91,9 +82,6 @@ account.syncToBrowser=Sync Account -> Browser
 account.syncToAccount=Sync Account <- Browser
 
 
-##########################
-###  TODO: Translate   ###
-##########################
 adminUserSettings.title=User Control Settings
 adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
@@ -386,6 +374,12 @@ addPageNumbers.selectText.3=Position
 addPageNumbers.selectText.4=Starting Number
 addPageNumbers.selectText.5=Pages to Number
 addPageNumbers.selectText.6=Custom Text
+##########################
+###  TODO: Translate   ###
+##########################
+addPageNumbers.customTextDesc=Custom Text
+addPageNumbers.numberPagesDesc=Which pages to number, default 'all', also accepts 1-5 or 2,5,9 etc
+addPageNumbers.customNumberDesc=Defaults to {n}, also accepts 'Page {n} of {total}', 'Text-{n}', '{filename}-{n}
 addPageNumbers.submit=Add Page Numbers
 
 
@@ -571,9 +565,6 @@ addImage.submit=Dodaj obraz
 #merge
 merge.title=Połącz
 merge.header=Połącz wiele dokumentów PDF (2+)
-##########################
-###  TODO: Translate   ###
-##########################
 merge.sortByName=Sort by name
 merge.sortByDate=Sort by date
 merge.submit=Połącz
@@ -676,9 +667,6 @@ watermark.selectText.4=Obrót (0-360):
 watermark.selectText.5=Odstęp w poziomie (odstęp między każdym znakiem wodnym w poziomie):
 watermark.selectText.6=Odstęp w pionie (odstęp między każdym znakiem wodnym w pionie):
 watermark.selectText.7=Nieprzezroczystość (0% - 100%):
-##########################
-###  TODO: Translate   ###
-##########################
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
 watermark.submit=Dodaj znak wodny
diff --git a/src/main/resources/messages_pt_BR.properties b/src/main/resources/messages_pt_BR.properties
index 1e334c0d..79f9dc18 100644
--- a/src/main/resources/messages_pt_BR.properties
+++ b/src/main/resources/messages_pt_BR.properties
@@ -31,9 +31,6 @@ sizes.medium=Médio
 sizes.large=Grande
 sizes.x-large=Muito grande
 error.pdfPassword=O documento PDF está protegido por senha e a senha não foi fornecida ou está incorreta
-##########################
-###  TODO: Translate   ###
-##########################
 delete=Delete
 username=Username
 password=Password
@@ -61,20 +58,14 @@ settings.downloadOption.1=Abrir na mesma janela
 settings.downloadOption.2=Abrir em nova janela
 settings.downloadOption.3=⇬ Fazer download do arquivo
 settings.zipThreshold=Compactar arquivos quando o número de arquivos baixados exceder
-##########################
-###  TODO: Translate   ###
-##########################
 settings.signOut=Sign Out
 settings.accountSettings=Account Settings
 
-##########################
-###  TODO: Translate   ###
-##########################
 account.title=Account Settings
 account.accountSettings=Account Settings
 account.adminSettings=Admin Settings - View and Add Users
 account.userControlSettings=User Control Settings
-account.changeUsername=New Username
+account.changeUsername=Change Username
 account.changeUsername=Change Username
 account.password=Confirmation Password
 account.oldPassword=Old password
@@ -91,9 +82,6 @@ account.syncToBrowser=Sync Account -> Browser
 account.syncToAccount=Sync Account <- Browser
 
 
-##########################
-###  TODO: Translate   ###
-##########################
 adminUserSettings.title=User Control Settings
 adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
@@ -386,6 +374,12 @@ addPageNumbers.selectText.3=Posição
 addPageNumbers.selectText.4=Número Inicial
 addPageNumbers.selectText.5=Páginas a Numerar
 addPageNumbers.selectText.6=Texto Personalizado
+##########################
+###  TODO: Translate   ###
+##########################
+addPageNumbers.customTextDesc=Custom Text
+addPageNumbers.numberPagesDesc=Which pages to number, default 'all', also accepts 1-5 or 2,5,9 etc
+addPageNumbers.customNumberDesc=Defaults to {n}, also accepts 'Page {n} of {total}', 'Text-{n}', '{filename}-{n}
 addPageNumbers.submit=Adicionar Números de Página
 
 
@@ -527,9 +521,6 @@ ocr.selectText.8=Normal (gerará um erro se o PDF já contiver texto)
 ocr.selectText.9=Configurações adicionais
 ocr.selectText.10=Modo OCR
 ocr.selectText.11=Remover imagens após o OCR (remove TODAS as imagens, útil apenas como parte do processo de conversão)
-##########################
-###  TODO: Translate   ###
-##########################
 ocr.selectText.12=Render Type (Advanced)
 ocr.help=Por favor, leia a documentação sobre como usar isso para outros idiomas e/ou fora do ambiente Docker
 ocr.credit=Este serviço usa OCRmyPDF e Tesseract para OCR.
@@ -574,9 +565,6 @@ addImage.submit=Adicionar Imagem
 #merge
 merge.title=Mesclar
 merge.header=Mesclar Vários PDFs (2+)
-##########################
-###  TODO: Translate   ###
-##########################
 merge.sortByName=Sort by name
 merge.sortByDate=Sort by date
 merge.submit=Mesclar
diff --git a/src/main/resources/messages_ro_RO.properties b/src/main/resources/messages_ro_RO.properties
index f03af619..11c66c75 100644
--- a/src/main/resources/messages_ro_RO.properties
+++ b/src/main/resources/messages_ro_RO.properties
@@ -31,9 +31,6 @@ sizes.medium=Medium
 sizes.large=Large
 sizes.x-large=X-Large
 error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect
-##########################
-###  TODO: Translate   ###
-##########################
 delete=Delete
 username=Username
 password=Password
@@ -61,20 +58,14 @@ settings.downloadOption.1=Deschide în aceeași fereastră
 settings.downloadOption.2=Deschide într-o fereastră nouă
 settings.downloadOption.3=Descarcă fișierul
 settings.zipThreshold=Împachetează fișierele când numărul de fișiere descărcate depășește
-##########################
-###  TODO: Translate   ###
-##########################
 settings.signOut=Sign Out
 settings.accountSettings=Account Settings
 
-##########################
-###  TODO: Translate   ###
-##########################
 account.title=Account Settings
 account.accountSettings=Account Settings
 account.adminSettings=Admin Settings - View and Add Users
 account.userControlSettings=User Control Settings
-account.changeUsername=New Username
+account.changeUsername=Change Username
 account.changeUsername=Change Username
 account.password=Confirmation Password
 account.oldPassword=Old password
@@ -91,9 +82,6 @@ account.syncToBrowser=Sync Account -> Browser
 account.syncToAccount=Sync Account <- Browser
 
 
-##########################
-###  TODO: Translate   ###
-##########################
 adminUserSettings.title=User Control Settings
 adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
@@ -386,6 +374,12 @@ addPageNumbers.selectText.3=Position
 addPageNumbers.selectText.4=Starting Number
 addPageNumbers.selectText.5=Pages to Number
 addPageNumbers.selectText.6=Custom Text
+##########################
+###  TODO: Translate   ###
+##########################
+addPageNumbers.customTextDesc=Custom Text
+addPageNumbers.numberPagesDesc=Which pages to number, default 'all', also accepts 1-5 or 2,5,9 etc
+addPageNumbers.customNumberDesc=Defaults to {n}, also accepts 'Page {n} of {total}', 'Text-{n}', '{filename}-{n}
 addPageNumbers.submit=Add Page Numbers
 
 
@@ -571,9 +565,6 @@ addImage.submit=Adăugare imagine
 #merge
 merge.title=Unire
 merge.header=Unirea mai multor PDF-uri (2+)
-##########################
-###  TODO: Translate   ###
-##########################
 merge.sortByName=Sort by name
 merge.sortByDate=Sort by date
 merge.submit=Unire
@@ -676,9 +667,6 @@ watermark.selectText.4=Rotire (0-360):
 watermark.selectText.5=widthSpacer (Spațiu între fiecare filigran pe orizontală):
 watermark.selectText.6=heightSpacer (Spațiu între fiecare filigran pe verticală):
 watermark.selectText.7=Opacitate (0% - 100%):
-##########################
-###  TODO: Translate   ###
-##########################
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
 watermark.submit=Adăugați Filigran
diff --git a/src/main/resources/messages_ru_RU.properties b/src/main/resources/messages_ru_RU.properties
index 425b2a0a..af466cad 100644
--- a/src/main/resources/messages_ru_RU.properties
+++ b/src/main/resources/messages_ru_RU.properties
@@ -31,9 +31,6 @@ sizes.medium=Medium
 sizes.large=Large
 sizes.x-large=X-Large
 error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect
-##########################
-###  TODO: Translate   ###
-##########################
 delete=Delete
 username=Username
 password=Password
@@ -61,20 +58,14 @@ settings.downloadOption.1=Открыть в том же окне
 settings.downloadOption.2=Открыть в новом окне
 settings.downloadOption.3=Загрузить файл
 settings.zipThreshold=Zip-файлы, когда количество загруженных файлов превышает
-##########################
-###  TODO: Translate   ###
-##########################
 settings.signOut=Sign Out
 settings.accountSettings=Account Settings
 
-##########################
-###  TODO: Translate   ###
-##########################
 account.title=Account Settings
 account.accountSettings=Account Settings
 account.adminSettings=Admin Settings - View and Add Users
 account.userControlSettings=User Control Settings
-account.changeUsername=New Username
+account.changeUsername=Change Username
 account.changeUsername=Change Username
 account.password=Confirmation Password
 account.oldPassword=Old password
@@ -91,9 +82,6 @@ account.syncToBrowser=Sync Account -> Browser
 account.syncToAccount=Sync Account <- Browser
 
 
-##########################
-###  TODO: Translate   ###
-##########################
 adminUserSettings.title=User Control Settings
 adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
@@ -386,6 +374,12 @@ addPageNumbers.selectText.3=Position
 addPageNumbers.selectText.4=Starting Number
 addPageNumbers.selectText.5=Pages to Number
 addPageNumbers.selectText.6=Custom Text
+##########################
+###  TODO: Translate   ###
+##########################
+addPageNumbers.customTextDesc=Custom Text
+addPageNumbers.numberPagesDesc=Which pages to number, default 'all', also accepts 1-5 or 2,5,9 etc
+addPageNumbers.customNumberDesc=Defaults to {n}, also accepts 'Page {n} of {total}', 'Text-{n}', '{filename}-{n}
 addPageNumbers.submit=Add Page Numbers
 
 
@@ -571,9 +565,6 @@ addImage.submit=Добавить изображение
 #merge
 merge.title=Объединить
 merge.header=Объединение нескольких PDF-файлов (2+)
-##########################
-###  TODO: Translate   ###
-##########################
 merge.sortByName=Sort by name
 merge.sortByDate=Sort by date
 merge.submit=Объединить
@@ -676,9 +667,6 @@ watermark.selectText.4=Поворот (0-360):
 watermark.selectText.5=widthSpacer (пробел между каждым водяным знаком по горизонтали):
 watermark.selectText.6=heightSpacer (пробел между каждым водяным знаком по вертикали):
 watermark.selectText.7=Непрозрачность (0% - 100%):
-##########################
-###  TODO: Translate   ###
-##########################
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
 watermark.submit=Добавить водяной знак
diff --git a/src/main/resources/messages_sv_SE.properties b/src/main/resources/messages_sv_SE.properties
index 847f94a6..49a57919 100644
--- a/src/main/resources/messages_sv_SE.properties
+++ b/src/main/resources/messages_sv_SE.properties
@@ -31,9 +31,6 @@ sizes.medium=Medium
 sizes.large=Large
 sizes.x-large=X-Large
 error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect
-##########################
-###  TODO: Translate   ###
-##########################
 delete=Delete
 username=Username
 password=Password
@@ -61,20 +58,14 @@ settings.downloadOption.1=Öppnas i samma fönster
 settings.downloadOption.2=Öppna i nytt fönster
 settings.downloadOption.3=Ladda ner fil
 settings.zipThreshold=Zip-filer när antalet nedladdade filer överskrider
-##########################
-###  TODO: Translate   ###
-##########################
 settings.signOut=Sign Out
 settings.accountSettings=Account Settings
 
-##########################
-###  TODO: Translate   ###
-##########################
 account.title=Account Settings
 account.accountSettings=Account Settings
 account.adminSettings=Admin Settings - View and Add Users
 account.userControlSettings=User Control Settings
-account.changeUsername=New Username
+account.changeUsername=Change Username
 account.changeUsername=Change Username
 account.password=Confirmation Password
 account.oldPassword=Old password
@@ -91,9 +82,6 @@ account.syncToBrowser=Sync Account -> Browser
 account.syncToAccount=Sync Account <- Browser
 
 
-##########################
-###  TODO: Translate   ###
-##########################
 adminUserSettings.title=User Control Settings
 adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
@@ -386,6 +374,12 @@ addPageNumbers.selectText.3=Position
 addPageNumbers.selectText.4=Starting Number
 addPageNumbers.selectText.5=Pages to Number
 addPageNumbers.selectText.6=Custom Text
+##########################
+###  TODO: Translate   ###
+##########################
+addPageNumbers.customTextDesc=Custom Text
+addPageNumbers.numberPagesDesc=Which pages to number, default 'all', also accepts 1-5 or 2,5,9 etc
+addPageNumbers.customNumberDesc=Defaults to {n}, also accepts 'Page {n} of {total}', 'Text-{n}', '{filename}-{n}
 addPageNumbers.submit=Add Page Numbers
 
 
@@ -571,9 +565,6 @@ addImage.submit=Lägg till bild
 #merge
 merge.title=Sammanfoga
 merge.header=Slå samman flera PDF-filer (2+)
-##########################
-###  TODO: Translate   ###
-##########################
 merge.sortByName=Sort by name
 merge.sortByDate=Sort by date
 merge.submit=Slå samman
@@ -676,9 +667,6 @@ watermark.selectText.4=Rotation (0-360):
 watermark.selectText.5=widthSpacer (mellanrum mellan varje vattenstämpel horisontellt):
 watermark.selectText.6=heightSpacer (mellanrum mellan varje vattenstämpel vertikalt):
 watermark.selectText.7=Opacitet (0% - 100%):
-##########################
-###  TODO: Translate   ###
-##########################
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
 watermark.submit=Lägg till vattenstämpel
diff --git a/src/main/resources/messages_zh_CN.properties b/src/main/resources/messages_zh_CN.properties
index 82c047ea..5d1d1c1d 100644
--- a/src/main/resources/messages_zh_CN.properties
+++ b/src/main/resources/messages_zh_CN.properties
@@ -31,9 +31,6 @@ sizes.medium=Medium
 sizes.large=Large
 sizes.x-large=X-Large
 error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect
-##########################
-###  TODO: Translate   ###
-##########################
 delete=Delete
 username=Username
 password=Password
@@ -61,20 +58,14 @@ settings.downloadOption.1=在同一窗口打开
 settings.downloadOption.2=在新窗口中打开
 settings.downloadOption.3=下载文件
 settings.zipThreshold=当下载的文件数量超过限制时，将文件压缩。
-##########################
-###  TODO: Translate   ###
-##########################
 settings.signOut=Sign Out
 settings.accountSettings=Account Settings
 
-##########################
-###  TODO: Translate   ###
-##########################
 account.title=Account Settings
 account.accountSettings=Account Settings
 account.adminSettings=Admin Settings - View and Add Users
 account.userControlSettings=User Control Settings
-account.changeUsername=New Username
+account.changeUsername=Change Username
 account.changeUsername=Change Username
 account.password=Confirmation Password
 account.oldPassword=Old password
@@ -91,9 +82,6 @@ account.syncToBrowser=Sync Account -> Browser
 account.syncToAccount=Sync Account <- Browser
 
 
-##########################
-###  TODO: Translate   ###
-##########################
 adminUserSettings.title=User Control Settings
 adminUserSettings.header=Admin User Control Settings
 adminUserSettings.admin=Admin
@@ -386,6 +374,12 @@ addPageNumbers.selectText.3=Position
 addPageNumbers.selectText.4=Starting Number
 addPageNumbers.selectText.5=Pages to Number
 addPageNumbers.selectText.6=Custom Text
+##########################
+###  TODO: Translate   ###
+##########################
+addPageNumbers.customTextDesc=Custom Text
+addPageNumbers.numberPagesDesc=Which pages to number, default 'all', also accepts 1-5 or 2,5,9 etc
+addPageNumbers.customNumberDesc=Defaults to {n}, also accepts 'Page {n} of {total}', 'Text-{n}', '{filename}-{n}
 addPageNumbers.submit=Add Page Numbers
 
 
@@ -571,9 +565,6 @@ addImage.submit=添加图片
 #merge
 merge.title=合并
 merge.header=合并多个PDF（2个以上）。
-##########################
-###  TODO: Translate   ###
-##########################
 merge.sortByName=Sort by name
 merge.sortByDate=Sort by date
 merge.submit=合并
@@ -676,9 +667,6 @@ watermark.selectText.4=旋转（0-360）：
 watermark.selectText.5=widthSpacer（水平方向上每个水印之间的空间）：
 watermark.selectText.6=heightSpacer（每个水印之间的垂直空间）：
 watermark.selectText.7=透明度（0% - 100%）：
-##########################
-###  TODO: Translate   ###
-##########################
 watermark.selectText.8=Watermark Type:
 watermark.selectText.9=Watermark Image:
 watermark.submit=添加水印