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

Merge branch 'upstream' into fork

Browse Source
This commit is contained in:
sk
2022-11-01 21:26:44 +01:00
parent 8aeda56fc8 4f8f698911
commit a4cb05080a
44 changed files with 1455 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -223,8 +223,6 @@
<string name="add_image_description">Add image description…</string>
<string name="image_description">Image description</string>
<string name="retry_upload">Retry upload</string>
<string name="image_upload_failed">Image failed to upload</string>
<string name="video_upload_failed">Video failed to upload</string>
<string name="edit_image">Edit image</string>
<string name="save">Save</string>
<string name="add_alt_text">Add alt text</string>
@@ -388,4 +386,20 @@
<string name="edit_multiple_changed">Post edited</string>
<string name="edit">Edit</string>
<string name="discard_changes">Discard changes?</string>
<string name="upload_failed">Upload failed</string>
<string name="file_size_bytes">%d bytes</string>
<string name="file_size_kb">%.2f KB</string>
<string name="file_size_mb">%.2f MB</string>
<string name="file_size_gb">%.2f GB</string>
<string name="file_upload_progress">%1$s of %2$s</string>
<string name="file_upload_time_remaining">%s remaining</string>
<string name="upload_error_connection_lost">Your device lost connection to the internet</string>
<string name="upload_processing">Processing…</string>
<!-- %s is version like 1.2.3 -->
<string name="update_available">Mastodon for Android %s is ready to download.</string>
<!-- %s is version like 1.2.3 -->
<string name="update_ready">Mastodon for Android %s is downloaded and ready to install.</string>
<!-- %s is file size -->
<string name="download_update">Download (%s)</string>
<string name="install_update">Install</string>
</resources>