Fix some conflicts

2025-11-21 18:44:24 +01:00
parent b4aca59372 058e8ab833
commit dae8544938
91 changed files with 8778 additions and 944 deletions
@@ -378,6 +378,7 @@
    <string name="report_dialog_title">Block and Report</string>
    <string name="block_only">Block</string>

+    <string name="manual_zaps">Manual Zap Splits</string>
    <string name="bookmarks">Bookmarks</string>
    <string name="drafts">Drafts</string>
    <string name="private_bookmarks">Private Bookmarks</string>