diff --git a/src/states_screens/dialogs/confirm_resolution_dialog.cpp b/src/states_screens/dialogs/confirm_resolution_dialog.cpp
index a418b577e..2acdc4031 100644
--- a/src/states_screens/dialogs/confirm_resolution_dialog.cpp
+++ b/src/states_screens/dialogs/confirm_resolution_dialog.cpp
@@ -78,8 +78,10 @@ bool ConfirmResolutionDialog::onEscapePressed()
 void ConfirmResolutionDialog::updateMessage()
 {
     //I18N: In the 'confirm resolution' dialog, that's shown when switching resoluton
-    stringw msg = _("Confirm resolution within %i seconds", (int)m_remaining_time);
-    //Log::info("ConfirmResolutionDialog", "stringc(msg.c_str()).c_str());
+
+    stringw msg = _P("Confirm resolution within %i second",
+        "Confirm resolution within %i seconds",
+        (int)m_remaining_time);
 
     LabelWidget* countdown_message = getWidget<LabelWidget>("title");
     countdown_message->setText( msg.c_str(), false );
diff --git a/src/tinygettext/dictionary.cpp b/src/tinygettext/dictionary.cpp
index e500c4fe2..9e6f8cbca 100644
--- a/src/tinygettext/dictionary.cpp
+++ b/src/tinygettext/dictionary.cpp
@@ -63,10 +63,10 @@ std::string
 Dictionary::translate_plural(const Entries& dict, const std::string& msgid, const std::string& msgid_plural, int count)
 {
   Entries::const_iterator i = dict.find(msgid);
-  const std::vector<std::string>& msgstrs = i->second;
 
   if (i != dict.end())
   {
+    const std::vector<std::string>& msgstrs = i->second;
     unsigned int n = 0;
     n = plural_forms.get_plural(count);
     assert(/*n >= 0 &&*/ n < msgstrs.size());