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

Merge remote-tracking branch 'megalodon_main/main'

Browse Source 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollFooterStatusDisplayItem.java
This commit is contained in:
LucasGGamerM
2023-11-28 14:31:42 -03:00
parent ed986b11af f7dfebcbea
commit 2ef3e7eab7
39 changed files with 73 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mastodon/src/main/res/values-nn/strings_sk.xml
View File

@@ -60,7 +60,6 @@
<string name="sk_color_palette_brown">Brun</string>
<string name="sk_color_palette_red">Raud</string>
<string name="sk_color_palette_yellow">Gul</string>
<string name="sk_poll_allow_multiple">Tillat fleire val</string>
<string name="sk_confirm_delete_and_redraft">Er du sikker på at du vil slette og skrive dette innlegget på nytt\?</string>
<string name="sk_confirm_unpin_post_title">Løys innlegg frå profil</string>
<string name="sk_image_description">Bildeforklaring</string>