resolve conflicts
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
<string name="scan_qr">Scan QR</string>
|
||||
<string name="show_anyway">Show Anyway</string>
|
||||
<string name="post_was_flagged_as_inappropriate_by">Post was flagged as inappropriate by</string>
|
||||
<string name="referenced_post_not_found">Referenced post not found</string>
|
||||
<string name="post_not_found">post not found</string>
|
||||
<string name="channel_image">Channel Image</string>
|
||||
<string name="referenced_event_not_found">Referenced event not found</string>
|
||||
<string name="could_not_decrypt_the_message">Could Not decrypt the message</string>
|
||||
@@ -172,4 +172,9 @@
|
||||
<string name="h">h</string>
|
||||
<string name="m">m</string>
|
||||
<string name="d">d</string>
|
||||
<string name="nudity">Nudity</string>
|
||||
<string name="profanity_hateful_speech">Profanity / Hateful speech</string>
|
||||
<string name="report_hateful_speech">Report Hateful speech</string>
|
||||
<string name="report_nudity_porn">Report Nudity / Porn</string>
|
||||
<string name="others">others</string>
|
||||
</resources>
|
||||
Reference in New Issue
Block a user