LucasGGamerM
|
14175a9140
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java
# mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
# mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusFavoritesListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusReblogsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverHashtagsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
# mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HashtagStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/layout/item_account_switcher.xml
# mastodon/src/main/res/values-ar-rDZ/strings_sk.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-nl-rNL/strings_sk.xml
# mastodon/src/main/res/values-pt-rPT/strings_sk.xml
# mastodon/src/main/res/values-v31/colors.xml
# mastodon/src/main/res/values/colors.xml
# mastodon/src/main/res/values/styles.xml
|
2023-06-03 19:56:16 -03:00 |
|
sk
|
1facb07c28
|
Merge remote-tracking branch 'upstream/l10n_master'
|
2023-05-29 13:01:24 +02:00 |
|
LucasGGamerM
|
d403f4ef01
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java
|
2023-05-16 18:26:23 -03:00 |
|
Eugen Rochko
|
cd1be782fa
|
New translations strings.xml (Armenian)
|
2023-05-16 18:44:56 +02:00 |
|
Eugen Rochko
|
67059f3d71
|
New translations strings.xml (Armenian)
|
2023-05-16 17:30:41 +02:00 |
|
sk
|
961c69b525
|
Merge remote-tracking branch 'upstream/master'
|
2023-05-13 15:15:00 +02:00 |
|
Eugen Rochko
|
cc28bba884
|
New translations strings.xml (Armenian)
|
2023-04-28 20:20:59 +02:00 |
|
Eugen Rochko
|
beb3081918
|
New translations strings.xml (Armenian)
|
2023-04-28 19:06:20 +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
|
7af0a3f351
|
New translations strings.xml (Armenian)
|
2023-01-30 00:01:52 +01:00 |
|
Eugen Rochko
|
0316ec340a
|
New translations strings.xml (Armenian)
|
2023-01-25 23:44:59 +01:00 |
|
Eugen Rochko
|
7b23ca1c96
|
New translations strings.xml (Armenian)
|
2023-01-24 21:53:08 +01:00 |
|
LucasGGamerM
|
d7004824fb
|
Decoupling moshidon strings from megalodon
|
2023-01-23 18:47:07 -03:00 |
|
Eugen Rochko
|
8622160e62
|
New translations strings.xml (Armenian)
|
2022-12-08 21:26:00 +01:00 |
|
sk
|
1f9611fc3e
|
Merge remote-tracking branch 'upstream/master'
|
2022-12-07 13:55:36 +01:00 |
|
Eugen Rochko
|
4ee640e072
|
New translations strings.xml (Armenian)
|
2022-12-03 23:52:34 +01:00 |
|
sk
|
2570445133
|
create empty strings_sk files for all languages
|
2022-12-01 00:23:25 +01:00 |
|
Eugen Rochko
|
87d11dcb0a
|
New translations strings.xml (Armenian)
|
2022-10-31 07:46:05 +01:00 |
|
Eugen Rochko
|
92d10d59c6
|
New translations strings.xml (Armenian)
|
2022-05-17 18:03:31 +02:00 |
|
Eugen Rochko
|
4df4528e60
|
New translations strings.xml (Armenian)
|
2022-05-02 05:00:32 +02:00 |
|
Eugen Rochko
|
e34542a420
|
New translations strings.xml (Armenian)
|
2022-05-01 22:17:54 +02:00 |
|
Eugen Rochko
|
93906ecf08
|
New translations strings.xml (Armenian)
|
2022-04-29 13:50:46 +02:00 |
|
Eugen Rochko
|
69c0873c8f
|
New translations strings.xml (Armenian)
|
2022-04-26 01:15:59 +02:00 |
|