Skip to content

Commit eae9bf4

Browse files
authored
feat: replace "event type" strings with "calendar" (#940)
Refs: #629
1 parent da8a27a commit eae9bf4

File tree

2 files changed

+23
-21
lines changed

2 files changed

+23
-21
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88
### Changed
9+
- Replaced "event types" concept with "calendars" ([#629])
910
- Weekday labels now use three-letter abbreviations instead of single letters ([#103])
1011
- Converting all-day events to timed events now respects the default start time and duration ([#917])
1112

@@ -186,6 +187,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
186187
[#603]: https://github.com/FossifyOrg/Calendar/issues/603
187188
[#613]: https://github.com/FossifyOrg/Calendar/issues/613
188189
[#641]: https://github.com/FossifyOrg/Calendar/issues/641
190+
[#629]: https://github.com/FossifyOrg/Calendar/issues/629
189191
[#682]: https://github.com/FossifyOrg/Calendar/issues/682
190192
[#706]: https://github.com/FossifyOrg/Calendar/issues/706
191193
[#729]: https://github.com/FossifyOrg/Calendar/issues/729

app/src/main/res/values/strings.xml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
<string name="end_before_start">The event cannot end earlier than it starts</string>
2828
<string name="event_added">Event added successfully</string>
2929
<string name="event_updated">Event updated successfully</string>
30-
<string name="filter_events_by_type">Filter events by type</string>
30+
<string name="filter_events_by_type">Filter events by calendar</string>
3131
<string name="please_fill_location">Please fill in a location to be shown on a map</string>
3232
<string name="public_event_notification_text">An event is upcoming</string>
33-
<string name="everything_filtered_out">You have filtered out all event types</string>
33+
<string name="everything_filtered_out">You have filtered out all calendars</string>
3434
<string name="event_color">Event color</string>
3535
<string name="default_calendar_color">Default calendar color</string>
3636

@@ -138,13 +138,13 @@
138138
<string name="import_events_from_ics">Import events from an .ics file</string>
139139
<string name="import_events_from_ics_pro">Import events from an .ics file (Pro)</string>
140140
<string name="export_events_to_ics">Export events to an .ics file</string>
141-
<string name="default_event_type">Default event type</string>
141+
<string name="default_event_type">Default calendar</string>
142142
<string name="export_past_events_too">Export past events too</string>
143143
<string name="export_tasks">Export tasks</string>
144144
<string name="export_past_entries">Export past entries too</string>
145-
<string name="include_event_types">Include event types</string>
145+
<string name="include_event_types">Include calendars</string>
146146
<string name="filename_without_ics">Filename (without .ics)</string>
147-
<string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
147+
<string name="ignore_event_types">Ignore calendars in the file, always use the default one</string>
148148

149149
<!-- Event details -->
150150
<string name="location">Location</string>
@@ -155,16 +155,16 @@
155155
<string name="week">Week</string>
156156
<string name="start_week_with_current_day">Start week with the current day</string>
157157

158-
<!-- Event types -->
159-
<string name="event_types">Event types</string>
160-
<string name="add_new_type">Add a new type</string>
161-
<string name="edit_type">Edit type</string>
162-
<string name="type_already_exists">Type with this title already exists</string>
158+
<!-- Calendars -->
159+
<string name="event_types">Calendars</string>
160+
<string name="add_new_type">Add a new calendar</string>
161+
<string name="edit_type">Edit calendar</string>
162+
<string name="type_already_exists">Calendar with this title already exists</string>
163163
<string name="color">Color</string>
164164
<string name="regular_event">Regular event</string>
165-
<string name="cannot_delete_default_type">Default event type cannot be deleted</string>
166-
<string name="select_event_type">Select an event type</string>
167-
<string name="move_events_into_default">Move affected events into the default event type</string>
165+
<string name="cannot_delete_default_type">Default calendar cannot be deleted</string>
166+
<string name="select_event_type">Select a calendar</string>
167+
<string name="move_events_into_default">Move affected events into the default calendar</string>
168168
<string name="remove_affected_events">Permanently remove affected events</string>
169169
<string name="unsync_caldav_calendar">To remove a CalDAV calendar you have to unsynchronize it</string>
170170

@@ -177,12 +177,12 @@
177177
<string name="other_holidays">Other holidays and observances</string>
178178
<string name="religious_holidays">Religious holidays</string>
179179
<string name="select_holidays_to_import">Select holidays to import</string>
180-
<string name="holidays_imported_successfully">Holidays have been successfully imported into the \"Holidays\" event type</string>
180+
<string name="holidays_imported_successfully">Holidays have been successfully imported into the \"Holidays\" calendar</string>
181181
<string name="importing_some_holidays_failed">Importing some events failed</string>
182182
<string name="importing_holidays_failed">Importing holidays failed</string>
183183

184184
<!-- Settings -->
185-
<string name="manage_event_types">Manage event types</string>
185+
<string name="manage_event_types">Manage calendars</string>
186186
<string name="start_day_at">Start day at</string>
187187
<string name="end_day_at">End day at</string>
188188
<string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
@@ -200,7 +200,7 @@
200200
<string name="display_description_or_location">Display description or location</string>
201201
<string name="delete_all_events">Delete all events</string>
202202
<string name="delete_all_events_and_tasks">Delete all events and tasks</string>
203-
<string name="delete_all_events_confirmation">Are you sure you want to delete all events and tasks? This will leave your event types and other settings intact.</string>
203+
<string name="delete_all_events_confirmation">Are you sure you want to delete all events and tasks? This will leave your calendars and other settings intact.</string>
204204
<string name="show_a_grid">Show a grid</string>
205205
<string name="loop_reminders">Loop reminders until dismissed</string>
206206
<string name="dim_past_events">Dim past events</string>
@@ -227,7 +227,7 @@
227227
<string name="highlight_weekends">Highlight weekends on some views</string>
228228
<string name="highlight_weekends_color">Color of highlighted weekends</string>
229229
<string name="allow_changing_time_zones">Allow changing event time zones</string>
230-
<string name="manage_quick_filter_event_types">Manage quick filter event types</string>
230+
<string name="manage_quick_filter_event_types">Manage quick filter calendars</string>
231231
<string name="allow_creating_tasks">Allow creating tasks</string>
232232

233233
<!-- CalDAV sync -->
@@ -305,8 +305,8 @@
305305

306306
<!-- FAQ -->
307307
<string name="faq_1_title">How can I remove the holidays imported via the \"Add holidays\" button?</string>
308-
<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,
309-
long press the given event type and delete it by selecting the trashbin.</string>
308+
<string name="faq_1_text">Holidays created that way are inserted in a new calendar called \"Holidays\". You can go in Settings -> Manage calendars,
309+
long press the given calendar and delete it by selecting the trashbin.</string>
310310
<string name="faq_2_title">Can I sync my events via Google Calendar, or other service supporting CalDAV?</string>
311311
<string name="faq_2_title_extra">Maybe even share calendars with other people?</string>
312312
<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.
@@ -319,8 +319,8 @@
319319
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>
320320
<string name="faq_5_title">The app shows no notifications, why is that?</string>
321321
<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>
322-
<string name="faq_6_title">How can I modify or delete an existing event type?</string>
323-
<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>
322+
<string name="faq_6_title">How can I modify or delete an existing calendar?</string>
323+
<string name="faq_6_text">You can do both of those in the app Settings - Manage calendars. 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>
324324
<!--
325325
Haven't found some strings? There's more at
326326
https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res

0 commit comments

Comments
 (0)