diff --git a/.github/config/.finnishwords.txt b/.github/config/.finnishwords.txt
index 7ed6e803e..c6b8fa7f1 100644
--- a/.github/config/.finnishwords.txt
+++ b/.github/config/.finnishwords.txt
@@ -105,6 +105,7 @@ kaikkien
 kansio
 kansioille
 kansioina
+kansioita
 kansion
 kansiossa
 kansiot
@@ -531,6 +532,7 @@ yhdelle
 yhden
 yhteenlaskettu
 yhteys
+yhtään
 yksityinen
 yksityisen
 yksityiskohtia
diff --git a/swift_browser_ui_frontend/src/common/lang.js b/swift_browser_ui_frontend/src/common/lang.js
index 5ef6e3ca4..592fa3a11 100644
--- a/swift_browser_ui_frontend/src/common/lang.js
+++ b/swift_browser_ui_frontend/src/common/lang.js
@@ -76,8 +76,8 @@ let default_translations = {
         sharing_to_one_project: "This folder is shared to one project.",
         sharing_to_many_projects: "This folder is shared to multiple projects.",
         shared_with_read:
-          "This folder is shared with you. You can view" +
-          " and download files in this folder (Read access).",
+          "This folder is shared with you. You can view files only by" +
+          " using SD Desktop and download files in this folder (Read access)",
         shared_with_read_write:
           "This folder is shared with you. You can view, download, upload" +
           " and edit tags in this folder (Read and write access).",
@@ -260,10 +260,12 @@ let default_translations = {
         "No large (> 1GiB) downloads enabled. Click to " +
         "enable them for the duration of the session.",
       largeDownAction: "Enable",
-      emptyContainer: "This bucket is empty.",
-      emptyProject:
-        "The project does not contain any buckets " +
-        "or their use is not permitted.",
+      emptyContainer: "This folder has no content.",
+      emptyProject: {
+        all: "There are no folders in this project.",
+        sharedFrom: "You haven't shared any folders.",
+        sharedTo: "No folders have been shared with you.",
+      },
       emptyShared: "No buckets have been shared to the project.",
       emptyRequested:
         "No shared buckets have been requested for the " + "project.",
@@ -717,9 +719,12 @@ let default_translations = {
         "erikseen. Paina hyväksyäksesi suuret lataukset " +
         "nykyisen kirjautumisen ajaksi.",
       largeDownAction: "Hyväksy",
-      emptyContainer: "Säiliö on tyhjä.",
-      emptyProject:
-        "Projektilla ei ole säiliöitä " + "tai niiden käyttöä ei ole sallittu.",
+      emptyContainer: "Tämä kansio on tyhjä.",
+      emptyProject: {
+        all: "Tässä projektissa ei ole kansioita.",
+        sharedFrom: "Et ole jakanut yhtään kansiota.",
+        sharedTo: "Sinulle ei ole jaettu kansioita.",
+      },
       emptyShared: "Projektille ei ole jaettu säiliöitä.",
       emptyRequested: "Projektille ei ole pyydetty jakamaan säiliöitä.",
       sharing: "Jako - ",
diff --git a/swift_browser_ui_frontend/src/components/CObjectTable.vue b/swift_browser_ui_frontend/src/components/CObjectTable.vue
index d7eac0e8a..158d4a474 100644
--- a/swift_browser_ui_frontend/src/components/CObjectTable.vue
+++ b/swift_browser_ui_frontend/src/components/CObjectTable.vue
@@ -7,7 +7,7 @@
       headers.filter(header => header.key !== 'tags'): headers"
     :pagination.prop="disablePagination ? null : paginationOptions"
     :footer-options.prop="footerOptions"
-    :no-data-text="$t('message.emptyProject')"
+    :no-data-text="$t('message.emptyContainer')"
     :sort-by="sortBy"
     :sort-direction="sortDirection"
     selection-property="name"
diff --git a/swift_browser_ui_frontend/src/components/ContainerTable.vue b/swift_browser_ui_frontend/src/components/ContainerTable.vue
index ffb377554..d1f686467 100644
--- a/swift_browser_ui_frontend/src/components/ContainerTable.vue
+++ b/swift_browser_ui_frontend/src/components/ContainerTable.vue
@@ -6,7 +6,7 @@
       headers.filter(header => header.key !== 'tags'): headers"
     :pagination.prop="disablePagination ? null : paginationOptions"
     :footer-options.prop="footerOptions"
-    :no-data-text="$t('message.emptyProject')"
+    :no-data-text="getEmptyText()"
     :sort-by="sortBy"
     :sort-direction="sortDirection"
     external-data
@@ -409,6 +409,17 @@ export default {
         ? this.paginationTextOverrides
         : {};
     },
+    getEmptyText() {
+      if (this.$route.name == "SharedFrom") {
+        return this.$t("message.emptyProject.sharedFrom");
+      }
+      
+      if (this.$route.name == "SharedTo") {
+        return this.$t("message.emptyProject.sharedTo");
+      }
+
+      return this.$t("message.emptyProject.all");
+    },
   },
 };
 </script>