diff --git a/lib/l10n/app_fi.arb b/lib/l10n/app_fi.arb
index 00e2fef3..4df3744d 100644
--- a/lib/l10n/app_fi.arb
+++ b/lib/l10n/app_fi.arb
@@ -1,4 +1,3 @@
-
 {
 	"appTitle": "Photos",
 	"translator": "pHamala",
@@ -64,10 +63,6 @@
 	"@addToAlbumFailureNotification": {
 		"description": "Inform user that the item cannot be added to an album"
 	},
-	"addToAlbumAlreadyAddedNotification": "Kohde on jo albumissa",
-	"@addToAlbumAlreadyAddedNotification": {
-		"description": "Inform user that the item is already in the album"
-	},
 	"deleteSelectedProcessingNotification": "{count, plural, =1{Poistetaan 1 kohde} other{Poistetaan {count} kohdetta}}",
 	"@deleteSelectedProcessingNotification": {
 		"description": "Inform user that the selected items are being deleted",
@@ -371,7 +366,7 @@
 	"settingsShowDateInAlbumTitle": "Ryhmitä kuvat päivämäärän mukaan",
 	"settingsShowDateInAlbumDescription": "Apply only when the album is sorted by time",
 	"settingsThemeTitle": "Teema",
-	"settingsThemeDescription": "Customize the appearance of the app",
+	"settingsThemeDescription": "Muokkaa sovelluksen ulkoasua",
 	"settingsThemePageTitle": "Teema-asetukset",
 	"@settingsThemePageTitle": {
 		"description": "Dedicated page for theme settings"
@@ -559,38 +554,6 @@
 	"@albumDirPickerListEmptyNotification": {
 		"description": "Error when user pressing confirm without picking any folders"
 	},
-	"createAlbumDialogBasicLabel": "Yksinkertainen",
-	"@createAlbumDialogBasicLabel": {
-		"description": "Simple album"
-	},
-	"createAlbumDialogBasicDescription": "Yksinkertaiset albumit jaottelevat kuvat itse välittämättä palvelimen hierarkkiasta",
-	"@createAlbumDialogBasicDescription": {
-		"description": "Describe what a simple album is"
-	},
-	"createAlbumDialogFolderBasedLabel": "Kansio",
-	"@createAlbumDialogFolderBasedLabel": {
-		"description": "Folder based album"
-	},
-	"createAlbumDialogFolderBasedDescription": "Kansio-perusteiset albumit kuvaavat kansion sisältöä",
-	"@createAlbumDialogFolderBasedDescription": {
-		"description": "Describe what a folder based album is"
-	},
-	"convertBasicAlbumMenuLabel": "Muuta yksinkertaiseksi albumiksi",
-	"@convertBasicAlbumMenuLabel": {
-		"description": "Convert a non-simple album to a simple one"
-	},
-	"convertBasicAlbumConfirmationDialogTitle": "Muuta yksinkertaiseksi albumiksi",
-	"@convertBasicAlbumConfirmationDialogTitle": {
-		"description": "Make sure the user wants to perform the conversion"
-	},
-	"convertBasicAlbumConfirmationDialogContent": "Sovellus ei enää hallitse sisältöä. Voit vapaasti lisätä tai poistaa valokuvia.\n\nTätä muutosta ei voi perua",
-	"@convertBasicAlbumConfirmationDialogContent": {
-		"description": "Make sure the user wants to perform the conversion"
-	},
-	"convertBasicAlbumSuccessNotification": "Albumi muutettu onnistuneesti",
-	"@convertBasicAlbumSuccessNotification": {
-		"description": "Successfully converted the album"
-	},
 	"importFoldersTooltip": "Tuo kansioita",
 	"@importFoldersTooltip": {
 		"description": "Menu entry in the album page to import folders as albums"
@@ -1089,7 +1052,7 @@
 		}
 	},
 	"defaultButtonLabel": "OLETUS",
-	"addUserInputHint": "Add user",
+	"addUserInputHint": "Lisää käyttäjä",
 	"@addUserInputHint": {
 		"description": "Input a user name to share this album with"
 	},
@@ -1116,7 +1079,6 @@
 			}
 		}
 	},
-
 	"homeFolderNotFoundDialogTitle": "Kotikansiota ei löytynyt",
 	"@homeFolderNotFoundDialogTitle": {
 		"description": "The app failed to scan the user's home folder on signing in"
@@ -1129,6 +1091,82 @@
 	"@homeFolderInputInvalidEmpty": {
 		"description": "Home folder can't be left empty"
 	},
+	"createCollectionTooltip": "Uusi kokoelma",
+	"@createCollectionTooltip": {
+		"description": "Create a new collection. A collection can be an album, a folder, or something else in the future"
+	},
+	"createCollectionDialogAlbumLabel": "Albumi",
+	"@createCollectionDialogAlbumLabel": {
+		"description": "Create an album as collection"
+	},
+	"createCollectionDialogAlbumDescription": "Näytä kaikki palvelimelle lisäämäsi kuvat",
+	"@createCollectionDialogAlbumDescription": {
+		"description": "Describe how an album collection works"
+	},
+	"createCollectionDialogFolderLabel": "Kansio",
+	"@createCollectionDialogFolderLabel": {
+		"description": "Create a folder as collection"
+	},
+	"createCollectionDialogFolderDescription": "Näytä kaikki kansion kuvat",
+	"@createCollectionDialogFolderDescription": {
+		"description": "Describe how a folder collection works"
+	},
+	"convertAlbumTooltip": "Muuta albumiksi",
+	"@convertAlbumTooltip": {
+		"description": "Convert a non-album collection to an album"
+	},
+	"convertAlbumConfirmationDialogContent": "Muutosta ei voi perua",
+	"@convertAlbumConfirmationDialogContent": {
+		"description": "Make sure the user wants to perform the conversion"
+	},
+	"convertAlbumSuccessNotification": "Kokoelman muutos albumiksi onnistui",
+	"@convertAlbumSuccessNotification": {
+		"description": "Successfully converted the album"
+	},
+	"collectionFavoritesLabel": "Suosikit",
+	"@collectionFavoritesLabel": {
+		"description": "Browse photos added to favorites"
+	},
+	"favoriteTooltip": "Suosikki",
+	"@favoriteTooltip": {
+		"description": "Add photo to favorites"
+	},
+	"favoriteSuccessNotification": "Lisää suosikkeihin",
+	"@favoriteSuccessNotification": {
+		"description": "Successfully added photos to favorites"
+	},
+	"favoriteFailureNotification": "Kuvien lisäys suosikkeihin epäonnistui",
+	"@favoriteFailureNotification": {
+		"description": "Failed adding photos to favorites"
+	},
+	"unfavoriteTooltip": "Poista suosikeista",
+	"@unfavoriteTooltip": {
+		"description": "Remove photo to favorites"
+	},
+	"unfavoriteSuccessNotification": "Poistettu suosikeista",
+	"@unfavoriteSuccessNotification": {
+		"description": "Successfully removed photos from favorites"
+	},
+	"unfavoriteFailureNotification": "Suosikeista poisto epäonnistui",
+	"@unfavoriteFailureNotification": {
+		"description": "Failed removing photos from favorites"
+	},
+	"createCollectionDialogTagLabel": "Tunniste",
+	"@createCollectionDialogTagLabel": {
+		"description": "Create a collection containing files with tags"
+	},
+	"createCollectionDialogTagDescription": "Näytä kuvat tietyillä tunnisteilla",
+	"@createCollectionDialogTagDescription": {
+		"description": "Describe how a tag collection works"
+	},
+	"addTagInputHint": "Lisää tunniste",
+	"@addTagInputHint": {
+		"description": "Input a tag"
+	},
+	"tagPickerNoTagSelectedNotification": "Lisää ainakin yksi tunniste",
+	"@tagPickerNoTagSelectedNotification": {
+		"description": "At least 1 tag is required to create a tag collection. This error is shown when user try to create one without selecting any tags"
+	},
 
 	"errorUnauthenticated": "Ei sallittu pääsyä. Kirjaudu sovellukseen uudelleen mikäli virhe toistuu",
 	"@errorUnauthenticated": {
@@ -1158,4 +1196,4 @@
 	"@errorAlbumDowngrade": {
 		"description": "Album files are versioned. Overwriting a newer version is disallowed as it will lead to unexpected data loss"
 	}
-}
+}
\ No newline at end of file
diff --git a/lib/l10n/untranslated-messages.txt b/lib/l10n/untranslated-messages.txt
index 3e844387..704860db 100644
--- a/lib/l10n/untranslated-messages.txt
+++ b/lib/l10n/untranslated-messages.txt
@@ -379,25 +379,7 @@
   ],
 
   "fi": [
-    "createCollectionTooltip",
-    "createCollectionDialogAlbumLabel",
-    "createCollectionDialogAlbumDescription",
-    "createCollectionDialogFolderLabel",
-    "createCollectionDialogFolderDescription",
-    "convertAlbumTooltip",
-    "convertAlbumConfirmationDialogContent",
-    "convertAlbumSuccessNotification",
-    "collectionFavoritesLabel",
-    "favoriteTooltip",
-    "favoriteSuccessNotification",
-    "favoriteFailureNotification",
-    "unfavoriteTooltip",
-    "unfavoriteSuccessNotification",
-    "unfavoriteFailureNotification",
-    "createCollectionDialogTagLabel",
-    "createCollectionDialogTagDescription",
-    "addTagInputHint",
-    "tagPickerNoTagSelectedNotification"
+    
   ],
 
   "fr": [