summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/include/turns/core/settings.hpp6
-rw-r--r--lang/include/turns/lang/messages.hpp9
-rw-r--r--lang/po/de.po27
-rw-r--r--lang/po/en.po27
-rw-r--r--lang/tests/messages.cpp11
-rw-r--r--ui/res/ui.cmb11
6 files changed, 84 insertions, 7 deletions
diff --git a/core/include/turns/core/settings.hpp b/core/include/turns/core/settings.hpp
index ca7bae3..d864d86 100644
--- a/core/include/turns/core/settings.hpp
+++ b/core/include/turns/core/settings.hpp
@@ -9,9 +9,9 @@ namespace turns::core
{
namespace settings::key
{
- auto constexpr disposition_friendly_color = "disposition-friendly-color";
- auto constexpr disposition_hostile_color = "disposition-hostile-color";
- auto constexpr disposition_secret_color = "disposition-secret-color";
+ auto constexpr disposition_friendly_color = "disposition-color-friendly";
+ auto constexpr disposition_hostile_color = "disposition-color-hostile";
+ auto constexpr disposition_secret_color = "disposition-color-secret";
auto constexpr skip_defeated = "skip-defeated";
} // namespace key
diff --git a/lang/include/turns/lang/messages.hpp b/lang/include/turns/lang/messages.hpp
index 42de7bb..e57fce4 100644
--- a/lang/include/turns/lang/messages.hpp
+++ b/lang/include/turns/lang/messages.hpp
@@ -8,9 +8,13 @@ namespace turns::lang
auto constexpr static clear = "_Clear";
auto constexpr static delete_participant = "Delete participant";
auto constexpr static disposition = "Disposition";
+ auto constexpr static disposition_colors = "Disposition Colors";
auto constexpr static edit_participant = "Edit participant";
auto constexpr static end_turn_order = "End turn order";
auto constexpr static finish = "Finish";
+ auto constexpr static flow = "Flow";
+ auto constexpr static friendly = "Friendly";
+ auto constexpr static hostile = "Hostile";
auto constexpr static main_menu = "Main Menu";
auto constexpr static mark_as_defeated = "Mark as defeated";
auto constexpr static name = "Name";
@@ -18,15 +22,20 @@ namespace turns::lang
auto constexpr static next_participant = "Next participant";
auto constexpr static no_active_turn_order = "No active turn order";
auto constexpr static open = "_Open...";
+ auto constexpr static preferences = "Preferences";
+ auto constexpr static preferences_mnemonic = "_Preferences";
auto constexpr static previous_participant = "Previous participant";
auto constexpr static priority = "Priority";
auto constexpr static priority_number = "Priority {}";
auto constexpr static question_clear_turn_order = "Do you want to clear the turn order?";
auto constexpr static quit = "_Quit";
+ auto constexpr static reset = "Reset";
auto constexpr static round_number = "Round {}";
auto constexpr static save = "_Save";
auto constexpr static save_as = "Save as...";
auto constexpr static saving_failed_format = "Saving failed: {}";
+ auto constexpr static secret = "Secret";
+ auto constexpr static skip_defeated = "Skip defeated";
auto constexpr static start_turn_order = "Start turn order";
auto constexpr static stop = "Stop";
auto constexpr static stop_and_clear = "Stop and clear";
diff --git a/lang/po/de.po b/lang/po/de.po
index 4b4df44..15c2d72 100644
--- a/lang/po/de.po
+++ b/lang/po/de.po
@@ -20,6 +20,9 @@ msgstr "_Leeren"
msgid "Disposition"
msgstr "Gesinnung"
+msgid "Disposition Colors"
+msgstr "Gesinnungsfarben"
+
msgid "Delete participant"
msgstr "Teilnehmer entfernen"
@@ -35,6 +38,15 @@ msgstr "Zugreihenfolge beenden"
msgid "Finish"
msgstr "Abschließen"
+msgid "Flow"
+msgstr "Ablaufsteuerung"
+
+msgid "Friendly"
+msgstr "Freundlich"
+
+msgid "Hostile"
+msgstr "Feindseelig"
+
msgid "Main Menu"
msgstr "Hauptmenü"
@@ -56,6 +68,12 @@ msgstr "Keine aktive Zugreihenfolge"
msgid "_Open..."
msgstr "_Öffnen..."
+msgid "Preferences"
+msgstr "Einstellungen"
+
+msgid "_Preferences"
+msgstr "_Einstellungen"
+
msgid "Previous participant"
msgstr "Vorhergehender Teilnehmer"
@@ -68,6 +86,9 @@ msgstr "Priorität {}"
msgid "_Quit"
msgstr "_Beenden"
+msgid "Reset"
+msgstr "Zurücksetzen"
+
msgid "Round {}"
msgstr "Runde {}"
@@ -80,6 +101,12 @@ msgstr "Speichern unter..."
msgid "Saving failed: {}"
msgstr "Speichern fehlgeschlagen: {}"
+msgid "Secret"
+msgstr "Geheim"
+
+msgid "Skip defeated"
+msgstr "Besiegte Teilnehmer überspringen"
+
msgid "Start turn order"
msgstr "Zugreihenfolge starten"
diff --git a/lang/po/en.po b/lang/po/en.po
index 63ae770..54df09f 100644
--- a/lang/po/en.po
+++ b/lang/po/en.po
@@ -20,6 +20,9 @@ msgstr "_Clear"
msgid "Disposition"
msgstr "Disposition"
+msgid "Disposition Colors"
+msgstr "Disposition Colors"
+
msgid "Delete participant"
msgstr "Delete participant"
@@ -35,6 +38,15 @@ msgstr "End turn order"
msgid "Finish"
msgstr "Finish"
+msgid "Flow"
+msgstr "Flow"
+
+msgid "Friendly"
+msgstr "Friendly"
+
+msgid "Hostile"
+msgstr "Hostile"
+
msgid "Main Menu"
msgstr "Main Menu"
@@ -56,6 +68,12 @@ msgstr "No active turn order"
msgid "_Open..."
msgstr "_Open..."
+msgid "Preferences"
+msgstr "Preferences"
+
+msgid "_Preferences"
+msgstr "_Preferences"
+
msgid "Previous participant"
msgstr "Previous participant"
@@ -68,6 +86,9 @@ msgstr "Priority {}"
msgid "_Quit"
msgstr "_Quit"
+msgid "Reset"
+msgstr "Reset"
+
msgid "Round {}"
msgstr "Round {}"
@@ -80,6 +101,12 @@ msgstr "Save as..."
msgid "Saving failed: {}"
msgstr "Saving failed: {}"
+msgid "Secret"
+msgstr "Secret"
+
+msgid "Skip defeated"
+msgstr "Skip defeated"
+
msgid "Start turn order"
msgstr "Start turn order"
diff --git a/lang/tests/messages.cpp b/lang/tests/messages.cpp
index 441a831..cecb038 100644
--- a/lang/tests/messages.cpp
+++ b/lang/tests/messages.cpp
@@ -22,11 +22,15 @@ namespace turns::lang::tests
auto message = GENERATE(add_participant,
cancel,
clear,
- disposition,
delete_participant,
+ disposition,
+ disposition_colors,
edit_participant,
end_turn_order,
finish,
+ flow,
+ friendly,
+ hostile,
main_menu,
mark_as_defeated,
// a better solution is required to test the following entry:
@@ -35,14 +39,19 @@ namespace turns::lang::tests
next_participant,
no_active_turn_order,
open,
+ preferences,
+ preferences_mnemonic,
previous_participant,
priority,
priority_number,
question_clear_turn_order,
quit,
+ reset,
save,
save_as,
saving_failed_format,
+ secret,
+ skip_defeated,
start_turn_order,
stop,
stop_and_clear,
diff --git a/ui/res/ui.cmb b/ui/res/ui.cmb
index a3f5dd8..7142339 100644
--- a/ui/res/ui.cmb
+++ b/ui/res/ui.cmb
@@ -98,6 +98,7 @@
(1,6,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
(1,7,"GtkMenuButton","icon-name","open-menu",None,None,None,None,None,None,None,None,None),
(1,7,"GtkMenuButton","menu-model","9",None,None,None,None,None,None,None,None,None),
+ (1,7,"GtkMenuButton","use-underline","True",None,None,None,None,None,None,None,None,None),
(1,7,"GtkWidget","tooltip-text","Main Menu",1,None,None,None,None,None,None,None,None),
(1,8,"GtkActionable","action-name","win.add_participant",None,None,None,None,None,None,None,None,None),
(1,8,"GtkButton","icon-name","contact-new",None,None,None,None,None,None,None,None,None),
@@ -188,7 +189,8 @@
(4,4,"GtkWidget","margin-top","12",None,None,None,None,None,None,None,None,None),
(4,5,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
(6,1,"AdwPreferencesPage","icon-name","preferences-system-symbolic",None,None,None,None,None,None,None,None,None),
- (6,2,"AdwPreferencesGroup","title","Colors",1,None,None,None,None,None,None,None,None),
+ (6,1,"AdwPreferencesPage","title","Preferences",1,None,None,None,None,None,None,None,None),
+ (6,2,"AdwPreferencesGroup","title","Disposition Colors",1,None,None,None,None,None,None,None,None),
(6,3,"AdwActionRow","activatable-widget","7",None,None,None,None,None,None,None,None,None),
(6,3,"AdwPreferencesRow","title","Friendly",1,None,None,None,None,None,None,None,None),
(6,4,"AdwActionRow","activatable-widget","10",None,None,None,None,None,None,None,None,None),
@@ -205,13 +207,16 @@
(6,13,"GtkColorDialog","with-alpha","False",None,None,None,None,None,None,None,None,None),
(6,14,"GtkColorDialog","with-alpha","False",None,None,None,None,None,None,None,None,None),
(6,15,"GtkButton","icon-name","process-stop-symbolic",None,None,None,None,None,None,None,None,None),
+ (6,15,"GtkWidget","tooltip-text","Reset",1,None,None,None,None,None,None,None,None),
(6,15,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
(6,16,"GtkButton","icon-name","process-stop-symbolic",None,None,None,None,None,None,None,None,None),
+ (6,16,"GtkWidget","tooltip-text","Reset",1,None,None,None,None,None,None,None,None),
(6,16,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
(6,17,"GtkButton","icon-name","process-stop-symbolic",None,None,None,None,None,None,None,None,None),
+ (6,17,"GtkWidget","tooltip-text","Reset",1,None,None,None,None,None,None,None,None),
(6,17,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
- (6,18,"AdwPreferencesGroup","title","Control",None,None,None,None,None,None,None,None,None),
- (6,19,"AdwPreferencesRow","title","Skip defeated",None,None,None,None,None,None,None,None,None)
+ (6,18,"AdwPreferencesGroup","title","Flow",1,None,None,None,None,None,None,None,None),
+ (6,19,"AdwPreferencesRow","title","Skip defeated",1,None,None,None,None,None,None,None,None)
</object_property>
<object_data>
(1,1,"GtkWidget",2,2,None,1,None,None,None,None),
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-17 19:45:24 +0000