diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index cd6753fb0..0821bb1f3 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -4,13 +4,6 @@
     <string name="app_launcher_name">Calendar</string>
     <string name="change_view">Change view</string>
     <string name="daily_view">Daily view</string>
-    <string name="years_raw">years</string>
-    <string name="repeat_till">Repeat till</string>
-    <string name="selected_days">On selected days</string>
-    <string name="repeat_on_the_same_day_monthly">Repeat on the same day each month</string>
-    <string name="repeat_every_m">Repeat every</string>
-    <string name="before">before</string>
-    <string name="faq_4_title">Does the app support time zones\?</string>
     <string name="weekly_view">Weekly view</string>
     <string name="monthly_view">Monthly view</string>
     <string name="monthly_daily_view">Monthly and daily view</string>
@@ -19,9 +12,13 @@
     <string name="no_upcoming_events">No upcoming events.</string>
     <string name="go_to_today">Go to today</string>
     <string name="go_to_date">Go to date</string>
+
+    <!-- Widget titles -->
     <string name="widget_monthly">Calendar monthly</string>
     <string name="widget_list">Calendar event list</string>
     <string name="widget_todays_date">Calendar today\'s date</string>
+
+    <!-- Event -->
     <string name="event">Event</string>
     <string name="edit_event">Edit Event</string>
     <string name="new_event">New Event</string>
@@ -36,14 +33,18 @@
     <string name="public_event_notification_text">An event is upcoming</string>
     <string name="saving_filtered_out">Saving… But the selected event type is filtered out in the top Menu - Filter</string>
     <string name="everything_filtered_out">You have filtered out all event types</string>
+
+    <!-- Tasks -->
     <string name="task">Task</string>
     <string name="tasks">Tasks</string>
     <string name="edit_task">Edit Task</string>
-    <string name="duplicate_task">Duplicate task</string>
-    <string name="mark_completed">Mark completed</string>
     <string name="new_task">New Task</string>
     <string name="create_new_task">Create a new task</string>
+    <string name="duplicate_task">Duplicate task</string>
+    <string name="mark_completed">Mark completed</string>
     <string name="mark_incomplete">Mark incomplete</string>
+
+    <!-- Event Repetition -->
     <string name="repetition">Repetition</string>
     <string name="no_repetition">No repetition</string>
     <string name="daily">Daily</string>
@@ -52,6 +53,8 @@
     <string name="yearly">Yearly</string>
     <string name="weeks_raw">weeks</string>
     <string name="months_raw">months</string>
+    <string name="years_raw">years</string>
+    <string name="repeat_till">Repeat till</string>
     <string name="forever">Forever</string>
     <string name="event_is_repeatable">The event is repeatable</string>
     <string name="task_is_repeatable">The task is repeatable</string>
@@ -68,10 +71,13 @@
     <string name="times">times</string>
     <string name="repeat">Repeat</string>
     <string name="repeat_on">Repeat on</string>
+    <string name="selected_days">On selected days</string>
     <string name="the_same_day">The same day</string>
     <string name="the_last_day">The last day</string>
+    <string name="repeat_on_the_same_day_monthly">Repeat on the same day each month</string>
     <string name="repeat_on_the_last_day_monthly">Repeat on the last day of the month</string>
     <string name="repeat_on_the_same_day_yearly">Repeat on the same day every year</string>
+    <string name="repeat_every_m">Repeat every</string>
     <string name="every_m">Every</string>
     <string name="first_m">first</string>
     <string name="second_m">second</string>
@@ -79,6 +85,9 @@
     <string name="fourth_m">fourth</string>
     <string name="fifth_m">fifth</string>
     <string name="last_m">last</string>
+
+    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
+    <!-- used in repetition, like "Every first Sunday" -->
     <string name="repeat_every_f">Repeat every</string>
     <string name="every_f">Every</string>
     <string name="first_f">first</string>
@@ -87,29 +96,42 @@
     <string name="fourth_f">fourth</string>
     <string name="fifth_f">fifth</string>
     <string name="last_f">last</string>
+
+    <!-- Birthdays -->
     <string name="birthdays">Birthdays</string>
     <string name="add_birthdays">Add contact birthdays</string>
     <string name="no_birthdays">No birthdays have been found</string>
     <string name="no_new_birthdays">No new birthdays have been found</string>
     <string name="birthdays_added">Birthdays added successfully</string>
     <string name="add_birthdays_automatically">Add new birthdays automatically</string>
+
+    <!-- Anniversaries -->
     <string name="anniversaries">Anniversaries</string>
     <string name="add_anniversaries">Add contact anniversaries</string>
     <string name="no_anniversaries">No anniversaries have been found</string>
     <string name="no_new_anniversaries">No new anniversaries have been found</string>
     <string name="anniversaries_added">Anniversaries added successfully</string>
     <string name="add_anniversaries_automatically">Add new anniversaries automatically</string>
+
+    <!-- Event Reminders -->
     <string name="reminder">Reminder</string>
+    <string name="before">before</string>
     <string name="add_another_reminder">Add another reminder</string>
     <string name="event_reminders">Event reminders</string>
     <string name="reminders">Reminders</string>
+
+    <!-- Event attendees -->
     <string name="add_another_attendee">Add another attendee</string>
     <string name="my_status">My status:</string>
     <string name="going">Going</string>
     <string name="not_going">Not going</string>
     <string name="maybe_going">Maybe going</string>
     <string name="invited">Invited</string>
+
+    <!-- Time zones -->
     <string name="enter_a_country">Enter a country or time zone</string>
+
+    <!-- Export / Import -->
     <string name="import_events">Import events</string>
     <string name="export_events">Export events</string>
     <string name="import_events_from_ics">Import events from an .ics file</string>
@@ -122,11 +144,17 @@
     <string name="include_event_types">Include event types</string>
     <string name="filename_without_ics">Filename (without .ics)</string>
     <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
+
+    <!-- Event details -->
     <string name="location">Location</string>
     <string name="description">Description</string>
     <string name="all_day">All-day</string>
+
+    <!-- Weekly view -->
     <string name="week">Week</string>
     <string name="start_week_with_current_day">Start week with the current day</string>
+
+    <!-- Event types -->
     <string name="event_types">Event types</string>
     <string name="add_new_type">Add a new type</string>
     <string name="edit_type">Edit type</string>
@@ -138,6 +166,8 @@
     <string name="move_events_into_default">Move affected events into the default event type</string>
     <string name="remove_affected_events">Permanently remove affected events</string>
     <string name="unsync_caldav_calendar">To remove a CalDAV calendar you have to unsynchronize it</string>
+
+    <!-- Holidays -->
     <string name="holidays">Holidays</string>
     <string name="add_holidays">Add holidays</string>
     <string name="national_holidays">National holidays</string>
@@ -145,6 +175,8 @@
     <string name="holidays_imported_successfully">Holidays have been successfully imported into the \"Holidays\" event type</string>
     <string name="importing_some_holidays_failed">Importing some events failed</string>
     <string name="importing_holidays_failed">Importing holidays failed</string>
+
+    <!-- Settings -->
     <string name="manage_event_types">Manage event types</string>
     <string name="start_day_at">Start day at</string>
     <string name="end_day_at">End day at</string>
@@ -162,7 +194,7 @@
     <string name="replace_description_with_location">Replace event description with location</string>
     <string name="display_description_or_location">Display description or location</string>
     <string name="delete_all_events">Delete all events</string>
-    <string name="delete_all_events_confirmation">Are you sure you want to delete all events\? This will leave your event types and other settings intact.</string>
+    <string name="delete_all_events_confirmation">Are you sure you want to delete all events? This will leave your event types and other settings intact.</string>
     <string name="show_a_grid">Show a grid</string>
     <string name="loop_reminders">Loop reminders until dismissed</string>
     <string name="dim_past_events">Dim past events</string>
@@ -191,6 +223,8 @@
     <string name="allow_changing_time_zones">Allow changing event time zones</string>
     <string name="manage_quick_filter_event_types">Manage quick filter event types</string>
     <string name="allow_creating_tasks">Allow creating tasks</string>
+
+    <!-- CalDAV sync -->
     <string name="caldav">CalDAV</string>
     <string name="select_caldav_calendars">Select calendars to sync</string>
     <string name="manage_synced_calendars">Manage synced calendars</string>
@@ -208,6 +242,9 @@
     <string name="status_free">Free</string>
     <string name="status_busy">Busy</string>
     <string name="fetching_event_failed">Fetching event %s failed</string>
+
+    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
+    <!-- used in repetition, like "Every last Sunday" -->
     <string name="monday_alt">Monday</string>
     <string name="tuesday_alt">Tuesday</string>
     <string name="wednesday_alt">Wednesday</string>
@@ -215,6 +252,8 @@
     <string name="friday_alt">Friday</string>
     <string name="saturday_alt">Saturday</string>
     <string name="sunday_alt">Sunday</string>
+
+    <!-- List widget config example events -->
     <string name="sample_title_1">Workout</string>
     <string name="sample_description_1">Leg day</string>
     <string name="sample_title_2">Meeting with John</string>
@@ -223,6 +262,8 @@
     <string name="sample_title_4">Lunch with Mary</string>
     <string name="sample_description_4">In the Plaza</string>
     <string name="sample_title_5">Coffee time</string>
+
+    <!-- List widget config -->
     <string name="show_events_happening">Show events happening:</string>
     <string name="within_the_next_one_year">Within the next 1 year</string>
     <string name="today_only">Today only</string>
@@ -239,16 +280,27 @@
         <item quantity="one">Within the next %d month</item>
         <item quantity="other">Within the next %d months</item>
     </plurals>
-    <string name="faq_1_title">How can I remove the holidays imported via the \"Add holidays\" button\?</string>
-    <string name="faq_1_text">Holidays created that way are inserted in a new event type called \"Holidays\". You can go in Settings -&gt; Manage Event Types, long press the given event type and delete it by selecting the trashbin.</string>
-    <string name="faq_2_title">Can I sync my events via Google Calendar, or other service supporting CalDAV\?</string>
-    <string name="faq_2_title_extra">Maybe even share calendars with other people\?</string>
-    <string name="faq_3_title">I see the visual reminders, but hear no audio. What can I do\?</string>
-    <string name="faq_2_text">Yes, just toggle \"CalDAV sync\" in the app settings and select the calendars you want to sync. However, you will need some third party app handling the synchronization between the device and servers. In case you want to synchronize a Google calendar, their official Calendar app will do the job. For other calendars you will need a third party sync adapter, for example DAVx5.</string>
-    <string name="faq_3_text">Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted.</string>
-    <string name="faq_4_text">Yes, it does. By default all events are created in your current time zone. If you want to change an events\' time zone, you will first have to enable the time zone picker at the app settings, then change it at the Event Details screen. It is disabled by default as most people won\'t need it.</string>
-    <string name="faq_5_title">The app shows no notifications, why is that\?</string>
+
+    <!-- FAQ -->
+    <string name="faq_1_title">How can I remove the holidays imported via the \"Add holidays\" button?</string>
+    <string name="faq_1_text">Holidays created that way are inserted in a new event type called \"Holidays\". You can go in Settings -> Manage Event Types,
+        long press the given event type and delete it by selecting the trashbin.</string>
+    <string name="faq_2_title">Can I sync my events via Google Calendar, or other service supporting CalDAV?</string>
+    <string name="faq_2_title_extra">Maybe even share calendars with other people?</string>
+    <string name="faq_2_text">Yes, just toggle \"CalDAV sync\" in the app settings and select the calendars you want to sync. However, you will need some third party app handling the synchronization between the device and servers.
+        In case you want to synchronize a Google calendar, their official Calendar app will do the job. For other calendars you will need a third party sync adapter, for example DAVx5.</string>
+    <string name="faq_3_title">I see the visual reminders, but hear no audio. What can I do?</string>
+    <string name="faq_3_text">Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings,
+        pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted.</string>
+    <string name="faq_4_title">Does the app support time zones?</string>
+    <string name="faq_4_text">Yes, it does. By default all events are created in your current time zone. If you want to change an events\' time zone,
+        you will first have to enable the time zone picker at the app settings, then change it at the Event Details screen. It is disabled by default as most people won\'t need it.</string>
+    <string name="faq_5_title">The app shows no notifications, why is that?</string>
     <string name="faq_5_text">Check your device battery and notification settings, if there is nothing blocking the reminders, or killing the app in the background. You might also want to take a look at &lt;a href=https://dontkillmyapp.com&gt;https://dontkillmyapp.com&lt;/a&gt;, it has some useful tips.</string>
-    <string name="faq_6_title">How can I modify or delete an existing event type\?</string>
+    <string name="faq_6_title">How can I modify or delete an existing event type?</string>
     <string name="faq_6_text">You can do both of those in the app Settings - Manage event types. Just click on the wanted one for changing the label and color, or select the wanted one by long pressing it and use the trashbin at the top menu for deleting.</string>
+    <!--
+        Haven't found some strings? There's more at
+        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
+    -->
 </resources>