Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
moshidon/metadata
History
LucasGGamerM da5186c7b5 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/DiffRemovedSpan.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
#	mastodon/src/main/res/drawable/bg_note_edit.xml
#	mastodon/src/main/res/layout/fragment_profile.xml
#	metadata/uk/full_description.txt
 		2023-11-17 16:02:23 -03:00
..
ar Merge remote-tracking branch 'megalodon_main/main' 2023-09-11 16:47:24 -03:00
ar-DZ Translated using Weblate (Arabic (Algeria)) 2023-09-05 12:09:40 +00:00
ca Merge remote-tracking branch 'megalodon_main/main' 2023-09-11 16:47:24 -03:00
cy/changelogs Translated using Weblate (Welsh) 2023-10-16 17:27:28 +00:00
de-DE Merge remote-tracking branch 'megalodon_main/main' 2023-11-17 16:02:23 -03:00
en-US Merge remote-tracking branch 'megalodon_main/main' 2023-11-17 16:02:23 -03:00
es Translated using Weblate (Spanish) 2023-07-16 16:02:44 +00:00
es-ES Translated using Weblate (Spanish) 2023-04-02 11:39:55 +00:00
fa-IR Merge remote-tracking branch 'megalodon_weblate/main' 2023-09-29 16:29:16 -03:00
fr Translated using Weblate (French) 2023-09-05 12:09:39 +00:00
fr-FR Merge remote-tracking branch 'megalodon_main/main' into m3-merger 2023-08-20 11:34:44 -03:00
gl-ES Merge remote-tracking branch 'megalodon_main/main' into m3-merger 2023-08-20 11:34:44 -03:00
hr Translated using Weblate (Croatian) 2023-09-05 12:09:40 +00:00
id Merge remote-tracking branch 'megalodon_weblate/main' 2023-09-29 16:29:16 -03:00
it-IT Merge remote-tracking branch 'megalodon_main/main' into m3-merger 2023-08-20 11:34:44 -03:00
ja-JP Merge remote-tracking branch 'megalodon_main/main' 2023-10-28 10:46:33 -03:00
kab Translated using Weblate (Kabyle) 2023-06-11 19:15:25 +00:00
ko/changelogs Merge remote-tracking branch 'megalodon_main/main' into m3-merger 2023-08-20 11:34:44 -03:00
my Translated using Weblate (Burmese) 2023-09-05 12:09:40 +00:00
nl-NL Translated using Weblate (Dutch) 2023-02-01 22:00:12 -03:00
oc Translated using Weblate (Occitan) 2023-06-11 19:15:26 +00:00
pl Translated using Weblate (Polish) 2023-05-26 00:16:39 +00:00
pl-PL Translated using Weblate (Polish) 2023-01-30 19:04:45 +00:00
pt-BR Translated using Weblate (Portuguese (Brazil)) 2023-09-19 18:00:04 +00:00
pt-PT Merge remote-tracking branch 'megalodon_main/main' 2023-06-13 14:03:50 -03:00
ro Merge remote-tracking branch 'weblate/master' into m3-merger 2023-08-27 13:55:03 -03:00
ru/changelogs Merge remote-tracking branch 'megalodon_main/main' 2023-08-29 10:41:09 -03:00
ru-RU Translated using Weblate (Russian) 2023-06-11 15:37:38 +00:00
sl Merge remote-tracking branch 'megalodon_main/main' into m3-merger 2023-08-24 08:17:57 -03:00
sv Translated using Weblate (Swedish) 2023-04-02 11:39:55 +00:00
sv-SE Translated using Weblate (Swedish) 2023-02-01 22:00:12 -03:00
uk Merge remote-tracking branch 'megalodon_main/main' 2023-11-17 16:02:23 -03:00
vi Translated using Weblate (Vietnamese) 2023-07-07 14:57:12 +00:00
zh-CN Translated using Weblate (Chinese (Simplified)) 2023-09-26 17:16:44 +00:00
zh-Hans/changelogs Merge remote-tracking branch 'megalodon_main/main' 2023-11-17 16:02:23 -03:00
zh-TW Translated using Weblate (Chinese (Traditional)) 2023-09-05 12:09:40 +00:00