merge with recent changes to main

2023-03-31 10:50:37 +09:00
parent 32067fe800 9fa3b1db34
commit a01a28de0e
35 changed files with 795 additions and 104 deletions
@@ -285,4 +285,7 @@
    <string name="one_vote_per_user_on_atomic_votes">Only one vote per user is allowed on this type of poll</string>

    <string name="looking_for_event">"Looking for Event %1$s"</string>
+
+    <string name="custom_zaps_add_a_message">Add a public message</string>
+    <string name="custom_zaps_add_a_message_example">Thank you for all your work!</string>
 </resources>