owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/delete-redraft' into fork

Browse Source
This commit is contained in:
sk
2022-05-26 19:28:09 +02:00
parent 0186b7f8da 3a4d13b1c6
commit 12f7336392
6 changed files with 117 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mastodon/src/main/res/menu/post.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/delete" android:title="@string/delete"/>
<item android:id="@+id/delete_and_redraft" android:title="@string/delete_and_redraft"/>
<item android:id="@+id/pin" android:title="@string/pin_post"/>
<item android:id="@+id/unpin" android:title="@string/unpin_post"/>
<item android:id="@+id/mute" android:title="@string/mute_user"/>

6
mastodon/src/main/res/values-de-rDE/strings.xml
View File

@@ -343,4 +343,10 @@
<item quantity="one">%,d Reblog</item>
<item quantity="other">%,d Reblogs</item>
</plurals>
<string name="delete_and_redraft">Löschen und neu erstellen</string>
<string name="delete_and_redraft">L</string>
<string name="confirm_delete_and_redraft_title">Beitrag löschen und neu erstellen</string>
<string name="confirm_delete_and_redraft_title">B</string>
<string name="confirm_delete_and_redraft">Bist du dir sicher, dass du den Beitrag löschen und neu erstellen möchtest?</string>
<string name="confirm_delete_and_redraft">Bist du dir sicher, dass du den Beitrag löschen möchtest?</string>
</resources>

3
mastodon/src/main/res/values/strings.xml
View File

@@ -127,8 +127,11 @@
<string name="action_vote">Vote</string>
<string name="tap_to_reveal">Tap to reveal</string>
<string name="delete">Delete</string>
<string name="delete_and_redraft">Delete and re-draft</string>
<string name="confirm_delete_title">Delete Post</string>
<string name="confirm_delete_and_redraft_title">Delete and re-draft Post</string>
<string name="confirm_delete">Are you sure you want to delete this post?</string>
<string name="confirm_delete_and_redraft">Are you sure you want to delete and re-draft this post?</string>
<string name="deleting">Deleting…</string>
<string name="pin_post">Pin to profile</string>
<string name="confirm_pin_post_title">Pin post to profile</string>