Merge branch 'main' into lunny/issue_dev

options/locale/locale_en-US.ini

@@ -1681,27 +1681,34 @@ issues.comment_on_locked = You cannot comment on a locked issue.
 issues.delete = Delete
 issues.delete.title = Delete this issue?
 issues.delete.text = Do you really want to delete this issue? (This will permanently remove all content. Consider closing it instead, if you intend to keep it archived)
+
 issues.tracker = Time Tracker
-issues.start_tracking_short = Start Timer
-issues.start_tracking = Start Time Tracking
-issues.start_tracking_history = `started working %s`
+issues.timetracker_timer_start = Start timer
+issues.timetracker_timer_stop = Stop timer
+issues.timetracker_timer_discard = Discard timer
+issues.timetracker_timer_manually_add = Add Time
+
+issues.time_estimate_placeholder = 1h 2m
+issues.time_estimate_set = Set estimated time
+issues.time_estimate_display = Estimate: %s
+issues.change_time_estimate_at = changed time estimate to <b>%s</b> %s
+issues.remove_time_estimate_at = removed time estimate %s
+issues.time_estimate_invalid = Time estimate format is invalid
+issues.start_tracking_history = started working %s
 issues.tracker_auto_close = Timer will be stopped automatically when this issue gets closed
 issues.tracking_already_started = `You have already started time tracking on <a href="%s">another issue</a>!`
-issues.stop_tracking = Stop Timer
-issues.stop_tracking_history = `stopped working %s`
-issues.cancel_tracking = Discard
+issues.stop_tracking_history = worked for <b>%s</b> %s
 issues.cancel_tracking_history = `canceled time tracking %s`
-issues.add_time = Manually Add Time
 issues.del_time = Delete this time log
-issues.add_time_short = Add Time
-issues.add_time_cancel = Cancel
-issues.add_time_history = `added spent time %s`
+issues.add_time_history = added spent time <b>%s</b> %s
 issues.del_time_history= `deleted spent time %s`
+issues.add_time_manually = Manually Add Time
 issues.add_time_hours = Hours
 issues.add_time_minutes = Minutes
 issues.add_time_sum_to_small = No time was entered.
 issues.time_spent_total = Total Time Spent
 issues.time_spent_from_all_authors = `Total Time Spent: %s`
+
 issues.due_date = Due Date
 issues.invalid_due_date_format = "Due date format must be 'yyyy-mm-dd'."
 issues.error_modifying_due_date = "Failed to modify the due date."