10 files changed, 15 insertions(+), 14 deletions(-)

M image/assets/lang/Deutsch.json
M image/assets/lang/English.json
M image/assets/lang/Espanol.json
M image/assets/lang/Francais.json
M image/assets/lang/Polski.json
M image/assets/lang/Svenska.json
M module-apps/application-phonebook/data/PhonebookStyle.hpp
M module-apps/application-phonebook/models/NewContactModel.cpp
M module-apps/application-phonebook/widgets/InputLinesWithLabelIWidget.cpp
M module-gui/gui/widgets/Style.hpp

@@ 510,7 510,7 @@
   "app_phonebook_options_forward_namecard": "Visitenkarte weiterleiten",
   "app_phonebook_options_send_sms": "Als SMS senden",
   "app_phonebook_new_contact_first_name": "Vorname",
-  "app_phonebook_new_contact_second_name": "Nachname",
+  "app_phonebook_new_contact_last_name": "Nachname",
   "app_phonebook_new_contact_number": "Nummer",
   "app_phonebook_new_contact_second_number": "Zweite Nummer",
   "app_phonebook_new_contact_email": "E-Mail",

@@ 489,7 489,7 @@
   "app_phonebook_options_forward_namecard": "Forward namecard",
   "app_phonebook_options_send_sms": "Send via SMS",
   "app_phonebook_new_contact_first_name": "First name",
-  "app_phonebook_new_contact_second_name": "Second name",
+  "app_phonebook_new_contact_last_name": "Last name",
   "app_phonebook_new_contact_number": "Number",
   "app_phonebook_new_contact_second_number": "Second number",
   "app_phonebook_new_contact_email": "Email",

@@ 510,7 510,7 @@
   "app_phonebook_options_forward_namecard": "Reenviar tarjeta de visita",
   "app_phonebook_options_send_sms": "Enviar por SMS",
   "app_phonebook_new_contact_first_name": "Nombre",
-  "app_phonebook_new_contact_second_name": "Apellido",
+  "app_phonebook_new_contact_last_name": "Apellido",
   "app_phonebook_new_contact_number": "Número",
   "app_phonebook_new_contact_second_number": "Número alternativo",
   "app_phonebook_new_contact_email": "Correo electrónico",

@@ 479,7 479,7 @@
   "app_phonebook_options_forward_namecard": "Transférer la carte de visite",
   "app_phonebook_options_send_sms": "Envoyer via SMS",
   "app_phonebook_new_contact_first_name": "Pénom",
-  "app_phonebook_new_contact_second_name": "Nom",
+  "app_phonebook_new_contact_last_name": "Nom",
   "app_phonebook_new_contact_number": "Numéro",
   "app_phonebook_new_contact_second_number": "Second numéro",
   "app_phonebook_new_contact_email": "Email",

@@ 510,7 510,7 @@
   "app_phonebook_options_forward_namecard": "Prześlij dalej wizytówkę",
   "app_phonebook_options_send_sms": "Wyślij SMS-em",
   "app_phonebook_new_contact_first_name": "Imię",
-  "app_phonebook_new_contact_second_name": "Nazwisko",
+  "app_phonebook_new_contact_last_name": "Nazwisko",
   "app_phonebook_new_contact_number": "Numer",
   "app_phonebook_new_contact_second_number": "Drugi numer",
   "app_phonebook_new_contact_email": "E-mail",

@@ 396,7 396,7 @@
   "app_phonebook_options_forward_namecard": "Vidarebefordra kontaktuppgifter",
   "app_phonebook_options_send_sms": "Skicka över SMS",
   "app_phonebook_new_contact_first_name": "Förnamn",
-  "app_phonebook_new_contact_second_name": "Efternamn",
+  "app_phonebook_new_contact_last_name": "Efternamn",
   "app_phonebook_new_contact_number": "Nummer",
   "app_phonebook_new_contact_second_number": "Alternativnummer",
   "app_phonebook_new_contact_email": "Mail",

@@ 110,12 110,12 @@ namespace phonebookStyle
     namespace inputLinesWithLabelWidget
     {
         inline constexpr uint32_t w                = style::window::default_body_width;
-        inline constexpr uint32_t h                = 63;
-        inline constexpr uint32_t title_label_h    = 24;
+        inline constexpr uint32_t h                = 67;
+        inline constexpr uint32_t title_label_h    = 26;
         inline constexpr uint32_t input_text_h     = 33;
-        inline constexpr uint32_t span_size        = 6;
+        inline constexpr uint32_t span_size        = 8;
         inline constexpr uint32_t line_spacing     = 15;
-        inline constexpr int32_t underline_padding = 2;
+        inline constexpr int32_t underline_padding = 4;
     } // namespace inputLinesWithLabelWidget
 
     namespace outputLinesTextWithLabelWidget

@@ 75,13 75,13 @@ void NewContactModel::createData()
         [app]() { app->getCurrentWindow()->selectSpecialCharacter(); },
         [this]() { this->ContactDataChanged(); }));
 
-    internalData.back()->setMargins(gui::Margins(style::widgets::leftMargin, style::margins::very_big, 0, 0));
-
     internalData.push_back(new gui::InputBoxWithLabelAndIconWidget(
         phonebookInternals::ListItemName::AddToFavourites,
         [app](const UTF8 &text) { app->getCurrentWindow()->bottomBarTemporaryMode(text, false); },
         [app]() { app->getCurrentWindow()->bottomBarRestoreFromTemporaryMode(); }));
 
+    internalData.back()->setMargins(gui::Margins(style::widgets::leftMargin, style::margins::very_big, 0, 0));
+
     internalData.push_back(new gui::InputBoxWithLabelAndIconWidget(
         phonebookInternals::ListItemName::AddToICE,
         [app](const UTF8 &text) { app->getCurrentWindow()->bottomBarTemporaryMode(text, false); },

@@ 25,7 25,7 @@ namespace gui
                            phonebookStyle::inputLinesWithLabelWidget::span_size +
                            phonebookStyle::inputLinesWithLabelWidget::input_text_h * lines +
                            (phonebookStyle::inputLinesWithLabelWidget::line_spacing * (lines - 1)));
-        setMargins(gui::Margins(style::widgets::leftMargin, style::margins::huge, 0, 0));
+        setMargins(gui::Margins(style::widgets::leftMargin, style::margins::large, 0, 0));
 
         vBox = new VBox(this, 0, 0, 0, 0);
         vBox->setEdges(RectangleEdge::None);


@@ 140,7 140,7 @@ namespace gui
     }
     void InputLinesWithLabelIWidget::secondNameHandler()
     {
-        titleLabel->setText(utils::translate("app_phonebook_new_contact_second_name"));
+        titleLabel->setText(utils::translate("app_phonebook_new_contact_last_name"));
         inputText->setTextType(TextType::SingleLine);
 
         onSaveCallback = [&](std::shared_ptr<ContactRecord> contact) {

@@ 284,6 284,7 @@ namespace style
         inline constexpr auto small      = 6U;
         inline constexpr auto big        = 8U;
         inline constexpr auto very_big   = 12U;
+        inline constexpr auto large      = 20U;
         inline constexpr auto huge       = 24U;
     } // namespace margins