diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6df26993..8a322ba7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -422,7 +422,7 @@ en:
     cron_email_subject: Tracks actions due in the next 7 days
     feeds_link_text: feeds provided by Tracks
     message_gateway:
-      description: 'If Tracks is running on the same server as your mail server, you can use the integrated mail handler built into tracks. Steps to set it up:'
+      description: 'If Tracks is running on the same server as your mail server, you can use the integrated mail handler built into Tracks. Steps to set it up:'
       rich_api_tip: 'You can also use the Rich Todo API to send in tasks like "do laundry @ Home" or "Call Bill > project X". The subject of the message will fill description, context, and project, while the body will populate the tasks''s note.'
       configuration: "You may need to configure your %{site_yml} to tell the message gateway to look at the %{to_name} field or %{from_name} field to lookup Tracks' user from the email address in that field."
       one_user_configuration: "You can also send all email to a specific Tracks user. Configure mail_dispatch in site.yml to %{single_user_var_name} and pass the login of the user: %{code}"
@@ -440,9 +440,9 @@ en:
         2a: "'Filter expression' should be set to 'catch_all()'"
         2b: "'Action' should be 'forward(\"http://mytracksserver.domain.com/mailgun/mime\")'"
         '3': 'Go to %{preferences_link} and enter your incoming Mailgun email address (e.g. tracks@user.mailgun.com) in the "%{sms_email_name}" box.'
-        '4': 'Select a default context for emails to be put in with "%{sms_context_name"'
+        '4': 'Select a default context for emails to be put in with "%{sms_context_name}"'
         '5': "Add your Mailgun API key (not the Public API key) to the Tracks 'site.yml'"
-        '6': "Update the mailmap in 'site.yml' to define which senders can send emails to which incoming addresses. For example, to send emails from your work and home email accounts to your tracks Mailgun route, set it up like this: %{code}"
+        '6': "Update the mailmap in 'site.yml' to define which senders can send emails to which incoming addresses. For example, to send emails from your work and home email accounts to your Tracks Mailgun route, set it up like this: %{code}"
     email_rich:
       description: "For both of the above methods, the follow format can be used:"
       fields_title: "The fields are:"
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 4cb6adc6..6fdd01f1 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -130,8 +130,9 @@ fi:
     none: Ei
     not_available_abbr: ei
     note:
-      one: ei muistiinpanoja
-      other: 1 muistiinpano
+      one: 1 muistiinpano
+      other: "%{count} muistiinpanoa"
+      zero: ei muistiinpanoja
     notes: Muistiinpanot
     numbered_step: Askel %{number}
     ok: Ok
@@ -1329,10 +1330,12 @@ fi:
       multi_page_html: Näytetään %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> yhteensä
         <b>%{count}</b> tietueesta
       single_page:
-        one: '%{model} ei löytynyt'
-        other: Näytetään 1 %{model}
+        one: Näytetään 1 %{model}
+        other: Näytetään kaikki %{count} %{model}
+        zero: '%{model} ei löytynyt'
       single_page_html:
-        one: '%{model} ei löytynyt'
-        other: Näytetään <b>1</b> %{model}
+        one: Näytetään <b>1</b> %{model}
+        other: Näytetään <b>kaikki&nbsp;%{count}</b> %{model}
+        zero: '%{model} ei löytynyt'
     page_gap: "&hellip;"
     previous_label: "&#8592; Edellinen"