Merge branch '11392-argumenterror-trait-not-registered-timeouted' into 'master'

Resolve "ArgumentError: Trait not registered: timeouted"

Closes #11392

See merge request gitlab-org/gitlab-ee!11948

ee/spec/services/clusters/applications/check_upgrade_progress_service_spec.rb

@@ -34,7 +34,7 @@ describe Clusters::Applications::CheckUpgradeProgressService do
       end
 
       context 'when timed out' do
-        let(:application) { create(:clusters_applications_prometheus, :timeouted, :updating) }
+        let(:application) { create(:clusters_applications_prometheus, :timed_out, :updating) }
 
         it_behaves_like 'a terminated upgrade'
 

locale/gitlab.pot

@@ -8280,6 +8280,12 @@ msgstr ""
 msgid "Opens in a new window"
 msgstr ""
 
+msgid "Operation failed. Check pod logs for %{pod_name} for more details."
+msgstr ""
+
+msgid "Operation timed out. Check pod logs for %{pod_name} for more details."
+msgstr ""
+
 msgid "Operations"
 msgstr ""