Commit Graph

16 Commits

Author SHA1 Message Date
LucasGGamerM
665a0176b9 Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/res/layout/fragment_splash.xml
2023-04-14 14:27:42 -03:00
sk
3ad46926f1 Merge remote-tracking branch 'upstream/master' 2023-04-13 21:46:45 +02:00
Eugen Rochko
b2bca9dd2c New translations strings.xml (Romanian) 2023-04-07 21:47:30 +02:00
LucasGGamerM
33b62cf9aa Merge remote-tracking branch 'megalodon_weblate/main'
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/res/values-ca-rES/strings_sk.xml
#	mastodon/src/main/res/values-de-rDE/strings.xml
#	mastodon/src/main/res/values-es-rES/strings_sk.xml
#	mastodon/src/main/res/values-fr-rFR/strings_sk.xml
#	mastodon/src/main/res/values-gl-rES/strings_sk.xml
#	mastodon/src/main/res/values-ko-rKR/strings_sk.xml
#	mastodon/src/main/res/values-pt-rBR/strings_sk.xml
#	mastodon/src/main/res/values-sl-rSI/strings_sk.xml
#	mastodon/src/main/res/values-uk-rUA/strings_sk.xml
#	mastodon/src/main/res/values-zh-rCN/strings_sk.xml
#	metadata/ca/full_description.txt
#	metadata/cy/full_description.txt
#	metadata/es/changelogs/65.txt
#	metadata/es/changelogs/67.txt
#	metadata/es/full_description.txt
#	metadata/id/full_description.txt
#	metadata/ko/full_description.txt
#	metadata/pl/full_description.txt
#	metadata/sl/changelogs/65.txt
#	metadata/sl/changelogs/67.txt
#	metadata/sv/full_description.txt
#	metadata/uk/full_description.txt
#	metadata/zh-Hans/full_description.txt
2023-02-13 15:38:28 -03:00
sk
2271f336b0 Merge remote-tracking branch 'upstream/l10n_master' 2023-02-13 17:37:40 +01:00
Eugen Rochko
f9b34b53c1 New translations strings.xml (Romanian) 2023-01-30 00:01:42 +01:00
Eugen Rochko
624d21d18b New translations strings.xml (Romanian) 2023-01-25 23:44:49 +01:00
Eugen Rochko
9f64e56923 New translations strings.xml (Romanian) 2023-01-24 21:52:56 +01:00
LucasGGamerM
d7004824fb Decoupling moshidon strings from megalodon 2023-01-23 18:47:07 -03:00
Eugen Rochko
e57b22d2fc New translations strings.xml (Romanian) 2022-12-08 21:26:25 +01:00
sk
1f9611fc3e Merge remote-tracking branch 'upstream/master' 2022-12-07 13:55:36 +01:00
Eugen Rochko
6a01124d13 New translations strings.xml (Romanian) 2022-12-03 23:52:14 +01:00
sk
2570445133 create empty strings_sk files for all languages 2022-12-01 00:23:25 +01:00
Eugen Rochko
ef57b7425d New translations strings.xml (Romanian) 2022-11-13 14:10:09 +01:00
Eugen Rochko
c21b2b6a43 New translations strings.xml (Romanian) 2022-11-13 13:05:06 +01:00
Eugen Rochko
458effc27c New translations strings.xml (Romanian) 2022-11-13 08:02:13 +01:00