merge resolved
This commit is contained in:
commit
c6988415ae
5 changed files with 116 additions and 2 deletions
|
@ -13,6 +13,8 @@
|
|||
<string name="error_media_upload_type">That type of file cannot be uploaded.</string>
|
||||
<string name="error_media_upload_opening">That file could not be opened.</string>
|
||||
<string name="error_media_upload_permission">Permission to read media is required.</string>
|
||||
<string name="error_media_download_permission">Permission to store media is required.</string>
|
||||
|
||||
<string name="error_media_upload_image_or_video">Images and videos cannot both be attached to the same status.</string>
|
||||
<string name="error_media_upload_sending">The upload failed.</string>
|
||||
<string name="error_report_too_few_statuses">At least one status must be reported.</string>
|
||||
|
@ -120,6 +122,7 @@
|
|||
</string>
|
||||
<string name="dialog_title_finishing_media_upload">Finishing Media Upload</string>
|
||||
<string name="dialog_message_uploading_media">Uploading…</string>
|
||||
<string name="dialog_download_image">Download</string>
|
||||
|
||||
<string name="visibility_public">Everyone can view</string>
|
||||
<string name="visibility_unlisted">Everyone can view, but not on public timelines</string>
|
||||
|
@ -152,5 +155,4 @@
|
|||
<string name="description_account_locked">Locked Account</string>
|
||||
<string name="status_share_content">Share content of toot</string>
|
||||
<string name="status_share_link">Share link to toot</string>
|
||||
|
||||
</resources>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue