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

Merge upstream redesign (#714)

Browse Source 
* merge toolbar fragment

* Fix store screenshot generator

* Fix alert color

* Fix #609

* Fix crash

* bigger hitbox for chips

* support mastodon languages

* merge ui utils

* merge stuff

* fix icon

* ensure 48dp touch target

* init local prefs, add helper function for enum values

* update compose action layout

* merge compose-adj files

* update extended footer

* fix poll wrong option checked

closes sk22#641

* no border when disabled

closes sk22#640

* Fix #610

* Minor fixes

* Fix alert color

* Fix #609

* Fix crash

* Fix #610

* Minor fixes

* add resources

* more compatible mastodon language

* fix html parser

* mark as read on refresh

* update tab bar

* tweak m3 buttons

* update compose-adj files

* tweak and update styles

* m3 expand button

* flag icon should be 18dp, actually

* More minor fixes

closes #612

* More minor fixes

closes #612

* Bump version

* fix no create status event when redrafting

* add material 3 assets

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Italian)

* New translations strings.xml (Greek)

* New translations strings.xml (Italian)

* New translations strings.xml (Thai)

* New translations strings.xml (Thai)

* New translations strings.xml (Italian)

* New translations strings.xml (Thai)

* use new buttons for profile fragment

* merge compose fragment

* merge all the styles! oh dear

* New translations full_description.txt (Indonesian)

* New translations full_description.txt (Chinese Simplified)

* New translations strings.xml (Chinese Simplified)

* New translations full_description.txt (Chinese Simplified)

* Fix #615

* Minor fixes

* Fix #611

* A bunch of crash fixes

* New translations strings.xml (Greek)

* Make the default server configurable

* Pass the system timezone to server when signing up

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Japanese)

* Fix #615

* Minor fixes

* Fix #611

* A bunch of crash fixes

* Make the default server configurable

* Pass the system timezone to server when signing up

* oops. accidentally pasted the commit message in the code

* Remove unused code that caused a crash for some users ¯\_(ツ)_/¯

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* Remove unused code that caused a crash for some users ¯\_(ツ)_/¯

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Belarusian)

* prepare merging profile fragment

* merge profile fragment

* New translations strings.xml (Belarusian)

* New translations strings.xml (Greek)

* fix icon padding

* apply post header changes

* minor margin tweaks

* fix footer buttons

* fix header announcement buttons

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations full_description.txt (Japanese)

* New translations strings.xml (Icelandic)

* New translations strings.xml (Icelandic)

* New translations strings.xml (Icelandic)

* fix replying

* New translations strings.xml (Icelandic)

* fix translate button

* fix more button visibility

* fix counts label styling

* fix disabled boost button opacity

* fix tab layouts

* fix notification icon color crash

* New translations strings.xml (Greek)

* implement elevation listener in home tab

* fix elevation and listener in home tab

* add elevation scroll listener to notifications

* New translations strings.xml (Scottish Gaelic)

* Add editorconfig

So that PRs like #625 don't happen again

* Crash fix

* 🤔

* New translations strings.xml (Greek)

* New translations strings.xml (Japanese)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* fix notification elevation and integrate divider

* 🤔

* Crash fix

* Add editorconfig

So that PRs like #625 don't happen again

* New translations strings.xml (Turkish)

* save interactions in cache

* New translations strings.xml (Turkish)

* merge new discover/search

* New translations strings.xml (Bengali)

* New translations strings.xml (Scottish Gaelic)

* New translations strings.xml (Bengali)

* merge new settings fragments

* fix no auth callback always being executed

* allow opening server info from profile

closes sk22#593

* fix hide boosts icon color

closes sk22#676

* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Turkish)

* update fedinuke list

from source; doesn't contain any modifications regarding a recent issue

* New translations strings.xml (Turkish)

* remove unused class

* fix crash

* darken m3 outline color a bit

* use m3 outline again

* fix misalignment

closes sk22#682

* New translations strings.xml (Turkish)

* New translations full_description.txt (Turkish)

* New translations short_description.txt (Turkish)

* fix crash

* fix metadata sorting

* show pronouns in header/account lists

* fix broken divider line

closes sk22#679

* trim pronouns

* improve pronoun display

* New translations strings.xml (French)

* New translations strings.xml (Japanese)

* fix broken federated timeline

closes sk22#685

* fix broken -1 fallback behavior

closes sk22#681

* don't display nothing if server about request fails

closes sk22#678

* New translations strings.xml (Ukrainian)

* migrate global prefs to local prefs

* do confirm unfollow by default

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations full_description.txt (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Russian)

* New translations strings.xml (Vietnamese)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Vietnamese)

* New translations full_description.txt (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Vietnamese)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* make sure list in prefs are always mutable and nut null

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Russian)

* fix pronouns edge case

* add back fix for stretched images

closes sk22#636

* fix null pointer on missing default posting language

* fix default posting language not being applied

* bigger username hitbox

closes sk22#688

* fix rtl header username alignment

closes sk22#689

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* hopefully fix crashes

closes sk22#692

* New translations strings.xml (Ukrainian)

* New translations full_description.txt (Ukrainian)

* fix pronoun crash

* New translations strings.xml (Persian)

* New translations strings.xml (Ukrainian)

* re-add true black mode

* asterisk can be a pronoun

* New translations strings.xml (Persian)

* true black mode fixes and clean-ups

* material 3 button background for switcher

* darker tab bar selected background

* better align follow/following button widths

* restore rainbow refresh colors

* fix search transition

* fix min width issue with switcher button

* fix no elevation when true black is enabled in light theme

* use statusForContent to determine spoilerRevealed

closes sk22#694

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* fix profile tab bar in true black theme

* fix m3 default button style

closes sk22#697

* prettier role badges

closes sk22#663

* fix translate button spacing

closes sk22#655

* use m3 switches in dialogs

closes sk22#653

* implement color palette switcher

* fix color palettes being overwritten

* add display and notification settings

* clean up code

* per-account single notification setting

* add missing items to notification types

* add prefix replies setting

* add show replies/boosts and reply visibility

* add load/see new posts settings

* fix spectator mode missing spoiler padding

* add a bunch of display settings

* update fedinuke

* add content type settings

* add settings for local-onlu

* add missing settings items

* fix visibility button icon tint

* hopefully fix some crashes

* normalize padding above edit text

* apparently, some people don't like pills

closes sk22#706

* fix play button color

closes sk22#705
This commit is contained in:
sk22
2023-07-16 18:01:42 +02:00
committed by GitHub
parent 3cfea0e660
commit 7677ad39ca
744 changed files with 24873 additions and 13485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
mastodon/src/main/res/values-hr-rHR/strings.xml
View File

@@ -8,13 +8,6 @@
<string name="finishing_auth">Završetak autorizacije…</string>
<string name="in_reply_to">Kao odgovor korisniku %s</string>
<string name="notifications">Obavijesti</string>
<string name="user_followed_you">te prati</string>
<string name="user_sent_follow_request">ti šalje zahtjev za praćenje</string>
<string name="poll_ended">anketa je završila</string>
<string name="time_seconds">%ds</string>
<string name="time_minutes">%dm</string>
<string name="time_hours">%dh</string>
<string name="time_days">%dd</string>
<string name="share_toot_title">Podijeli</string>
<string name="settings">Postavke</string>
<string name="publish">Objavi</string>
@@ -31,11 +24,6 @@
<item quantity="few">praćena</item>
<item quantity="other">praćenih</item>
</plurals>
<plurals name="posts">
<item quantity="one">objava</item>
<item quantity="few">objave</item>
<item quantity="other">objava</item>
</plurals>
<string name="posts">Objave</string>
<string name="posts_and_replies">Objave i Odgovori</string>
<string name="media">Mediji</string>
@@ -43,8 +31,6 @@
<string name="button_follow">Prati</string>
<string name="button_following">Pratim</string>
<string name="edit_profile">Uredi Profil</string>
<string name="mention_user">Spomeni %s</string>
<string name="share_user">Podijeli %s</string>
<string name="mute_user">Utišaj %s</string>
<string name="unmute_user">Uključi %s</string>
<string name="block_user">Blokiraj %s</string>
@@ -80,7 +66,6 @@
<item quantity="few">%d dana</item>
<item quantity="other">%d dana</item>
</plurals>
<string name="compose_poll_duration">Trajanje: %s</string>
<plurals name="x_seconds_left">
<item quantity="one">%d sekunda preostala</item>
<item quantity="few">%d sekunde preostalo</item>
@@ -101,11 +86,6 @@
<item quantity="few">%d dana preostalo</item>
<item quantity="other">%d dana preostalo</item>
</plurals>
<plurals name="x_voters">
<item quantity="one">%,d glasač</item>
<item quantity="few">%,d glasača</item>
<item quantity="other">%,d glasača</item>
</plurals>
<string name="poll_closed">Završeno</string>
<string name="confirm_mute_title">Utišaj Račun</string>
<string name="confirm_mute">Potvrdi utišavanje %s</string>
@@ -121,46 +101,31 @@
<string name="confirm_unblock_domain_title">Uključi Domenu</string>
<string name="confirm_unblock">Potvrdi uključivanje %s</string>
<string name="do_unblock">Uključi</string>
<string name="button_muted">Utišan</string>
<string name="button_blocked">Blokiran</string>
<string name="action_vote">Glasaj</string>
<string name="tap_to_reveal">Dodirni za otkrivanje</string>
<string name="delete">Obriši</string>
<string name="confirm_delete_title">Obriši objavu</string>
<string name="confirm_delete">Jesi li siguran da želiš obrisati ovaj post?</string>
<string name="deleting">Brisanje…</string>
<string name="notification_channel_audio_player">Reprodukcija glazbe</string>
<string name="play">Reproduciraj</string>
<string name="pause">Pauziraj</string>
<string name="log_out">Odjavi se</string>
<string name="add_account">Dodaj račun</string>
<string name="search_hint">Traži</string>
<string name="hashtags">Hashtagovi</string>
<string name="news">Vijesti</string>
<string name="for_you">Za tebe</string>
<string name="all_notifications">Sve</string>
<string name="mentions">Spominjanja</string>
<plurals name="x_people_talking">
<item quantity="one">%d osoba govori</item>
<item quantity="few">%d osobe govore</item>
<item quantity="other">%d osoba govori</item>
</plurals>
<plurals name="discussed_x_times">
<item quantity="one">Raspravljano %d put</item>
<item quantity="few">Raspravljano %d puta</item>
<item quantity="other">Raspravljano %d puta</item>
</plurals>
<string name="report_title">Prijavi %s</string>
<string name="report_choose_reason">Što nije u redu s ovom objavom?</string>
<string name="report_choose_reason_account">Što nije u redu s %s?</string>
<string name="report_choose_reason_subtitle">Odaberi približan razlog</string>
<string name="report_reason_personal">Ne sviđa mi se</string>
<string name="report_reason_personal_subtitle">Nije ništa što želiš vidjeti</string>
<string name="report_reason_spam">Spam je</string>
<string name="report_reason_spam_subtitle">Zlonamjerne veze, lažni angažman ili odgovori koji se ponavljaju</string>
<string name="report_reason_violation">Krši pravila instance</string>
<string name="report_reason_violation_subtitle">Svjestan/a si da krši određena pravila</string>
<string name="report_reason_other">Nešto drugo nije u redu</string>
<string name="report_reason_other_subtitle">Problem ne spada u druge kategorije</string>
<string name="report_choose_rule">Koja pravila se krše?</string>
<string name="report_choose_rule_subtitle">Odaberi sve što je primjenjivo</string>
@@ -169,15 +134,9 @@
<string name="report_comment_title">Postoji li još nešto što bismo trebali znati?</string>
<string name="report_comment_hint">Dodatni komentari</string>
<string name="sending_report">Slanje izvještaja…</string>
<string name="report_sent_title">Hvala na prijavi, razmotrit ćemo ovo.</string>
<string name="report_sent_subtitle">Dok mi ovo pregledavamo, možete poduzeti mjere protiv %s.</string>
<string name="unfollow_user">Prestani pratiti %s</string>
<string name="unfollow">Prestani pratiti</string>
<string name="block_user_explain">Više te neće moći pratiti ili vidjeti tvoje objave, ali mogu vidjeti jesu li blokirani.</string>
<string name="report_personal_title">Ne želiš vidjeti ovo?</string>
<string name="report_personal_subtitle">Kada vidiš nešto što ti se ne sviđa na Mastodonu, možeš ukloniti osobu iz svog iskustva.</string>
<string name="back">Natrag</string>
<string name="edit_photo">uredi</string>
<string name="password_note">Upotrijebi velika slova, posebne znakove i brojeve kako bi podigao jačinu tvoje lozinke.</string>
<string name="category_academia">Akademija</string>
<string name="category_activism">Aktivizam</string>
@@ -196,22 +155,11 @@
<string name="resend">Ponovno pošalji</string>
<string name="open_email_app">Otvori aplikaciju za e-poštu</string>
<string name="resent_email">Poslana je e-mail potvrda</string>
<string name="compose_hint">Upiši ili zalijepi ono što ti je na umu</string>
<string name="content_warning">Upozorenje za sadržaj</string>
<string name="add_image_description">Dodaj opis slike…</string>
<string name="retry_upload">Ponovi prijenos</string>
<string name="edit_image">Uredi sliku</string>
<string name="save">Spremi</string>
<string name="add_alt_text">Dodaj altenativni tekst</string>
<string name="alt_text_subtitle">Alternativni tekst opisuje vaše fotografije za osobe lošeg vida ili bez vida. Pokušajte uključiti samo dovoljno detalja da biste razumjeli kontekst.</string>
<string name="alt_text_hint">npr. Pas koji sumnjičavo gleda okolo suženih očiju u kameru.</string>
<string name="visibility_public">Javno</string>
<string name="visibility_followers_only">Samo pratitelji</string>
<string name="visibility_private">Samo ljudi koje spominjem</string>
<string name="search_all">Sve</string>
<string name="search_people">Ljudi</string>
<string name="recent_searches">Nedavne pretrage</string>
<string name="step_x_of_n">Korak %1$d od %2$d</string>
<string name="skip">Preskoči</string>
<string name="notification_type_follow">Novi pratitelji</string>
<string name="notification_type_favorite">Favoriti</string>
@@ -219,47 +167,21 @@
<string name="notification_type_poll">Ankete</string>
<string name="choose_account">Odaberi račun</string>
<string name="err_not_logged_in">Molimo te da se prvo prijaviš na Mastodon</string>
<plurals name="cant_add_more_than_x_attachments">
<item quantity="one">Ne možeš dodati više od %d medijskog privitka</item>
<item quantity="few">Ne možeš dodati više od %d medijska privitka</item>
<item quantity="other">Ne možeš dodati više od %d medijskih privitaka</item>
</plurals>
<string name="media_attachment_unsupported_type">Datoteka %s je nepodržane vrste</string>
<string name="media_attachment_too_big">Datoteka %1$s premašuje ograničenje veličine od %2$s MB</string>
<string name="settings_theme">Vizualni izgled</string>
<string name="theme_auto">Automatski</string>
<string name="theme_light">Svijetla</string>
<string name="theme_dark">Tamna</string>
<string name="theme_true_black">Crna</string>
<string name="settings_behavior">Ponašanje</string>
<string name="settings_gif">Animiraj avatare i emotikone</string>
<string name="settings_custom_tabs">Koristi interni preglednik</string>
<string name="settings_notifications">Obavijesti</string>
<string name="notify_me_when">Obavijesti me kada</string>
<string name="notify_anyone">bilo tko</string>
<string name="notify_follower">pratitelj</string>
<string name="notify_followed">netko koga pratim</string>
<string name="notify_none">nitko</string>
<string name="notify_favorites">Favorizira moj post</string>
<string name="notify_follow">Prati me</string>
<string name="notify_mention">Spominje me</string>
<string name="settings_boring">Dosadna zona</string>
<string name="settings_account">Postavke računa</string>
<string name="settings_contribute">Doprinesi Mastodonu</string>
<string name="settings_tos">Uvjeti pružanja usluga</string>
<string name="settings_privacy_policy">Politika privatnosti</string>
<string name="settings_spicy">Začinjena zona</string>
<string name="settings_clear_cache">Izbrišite predmemoriju medija</string>
<string name="settings_app_version">Mastodon za Android v%1$s (%2$d)</string>
<string name="media_cache_cleared">Medijska predmemorija je očišćena</string>
<string name="confirm_log_out">Jeste li siguran da se želiš odjaviti?</string>
<string name="sensitive_content">Osjetljiv sadržaj</string>
<string name="sensitive_content_explain">Autor je ovaj medij označio osjetljivim. Dodirni za otkrivanje.</string>
<string name="media_hidden">Dodirni za otkrivanje</string>
<string name="avatar_description">Idi na %s profil</string>
<string name="more_options">Više opcija</string>
<string name="reveal_content">Otkrij sadržaj</string>
<string name="hide_content">Sakrij sadržaj</string>
<string name="new_post">Nova objava</string>
<string name="button_reply">Odgovori</string>
<string name="button_favorite">Favorit</string>
@@ -268,13 +190,11 @@
<string name="add_media">Dodaj multimediju</string>
<string name="add_poll">Dodaj anketu</string>
<string name="emoji">Emotikoni</string>
<string name="post_visibility">Vidljivost objave</string>
<string name="home_timeline">Lokalna vremenska crta</string>
<string name="my_profile">Moj profil</string>
<string name="media_viewer">Preglednik medija</string>
<string name="follow_user">Prati %s</string>
<string name="unfollowed_user">Otpratio si %s</string>
<string name="followed_user">Sada pratiš %s</string>
<string name="open_in_browser">Otvori u pregledniku</string>
<string name="signup_reason_note">Ovo će nam pomoći da razmotrimo vašu prijavu.</string>
<string name="clear">Poništi</string>
@@ -288,7 +208,7 @@
<string name="error_saving_file">Greška prilikom spremanja datoteke</string>
<string name="file_saved">Datoteka spremljena</string>
<string name="downloading">Preuzimanje…</string>
<string name="no_app_to_handle_action">Ne postoji aplikacija za rukovanje ovom radnjom</string>
<!-- %s is the server domain -->
<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
<!-- %s is version like 1.2.3 -->
<!-- %s is version like 1.2.3 -->
@@ -296,4 +216,15 @@
<!-- %s is server domain -->
<!-- Shown in a progress dialog when you tap "follow all" -->
<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
<!-- %s is formatted file size ("467 KB image") -->
<!-- %s is the server domain -->
<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->
<!-- %s is the app name (Mastodon, key app_name). I made it a placeholder so everything Just Works™ with forks -->
<!-- %1$s is the date (may be relative, e.g. "today" or "yesterday"), %2$s is the time. You can reorder these placeholders if that works better for your language -->
<!-- %s is the timestamp ("tomorrow at 12:34") -->
<!-- %s is the timestamp ("tomorrow at 12:34") -->
<!-- %s is the username -->
<!-- %s is the timestamp ("tomorrow at 12:34") -->
<!-- Shown like a content warning, %s is the name of the filter -->
<!-- Shown in the post header. Please keep it short -->
</resources>

8
mastodon/src/main/res/values-hr-rHR/strings_sk.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="sk_expand">Proširi</string>
<string name="sk_notify_posts">Obavijesti o objavama</string>
<string name="sk_notification_type_posts">Obavijesti o objavama</string>
<string name="sk_notification_type_status">Objave</string>
<string name="sk_timeline_home">Home</string>
<string name="sk_timeline_local">Lokalno</string>
@@ -27,7 +27,7 @@
<string name="sk_welcome_title">Dobrodošli!</string>
<string name="sk_welcome_text">Morski pas te pozdravlja! Za početak, u nastavku unesi naziv domene svoje početne instance.</string>
<string name="sk_settings_always_reveal_content_warnings">Uvijek otkrij upozorenja o sadržaju</string>
<string name="sk_disable_marquee">Onemogući pomicanje teksta u naslovnim trakama</string>
<string name="sk_settings_enable_marquee">Onemogući pomicanje teksta u naslovnim trakama</string>
<string name="sk_settings_contribute">Doprinesi Megalodonu</string>
<string name="sk_reject_follow_request">Odbij zahtjev za praćenjem</string>
<string name="sk_bookmarked_as">Označeno kao %s</string>
@@ -38,7 +38,7 @@
<string name="sk_language_name">%s (%s)</string>
<string name="sk_confirm_clear_recent_languages">Jesi li siguran da želiš izbrisati listu nedavno korištenih jezika\?</string>
<string name="sk_example_domain">primjer.social</string>
<string name="sk_tabs_disable_swipe">Onemogući prelazak između kartica</string>
<string name="sk_settings_tabs_disable_swipe">Onemogući prelazak između kartica</string>
<string name="sk_settings_profile">Postavi profil</string>
<string name="sk_settings_posting">Postavke objavljivanja</string>
<string name="sk_settings_filters">Konfiguriraj filtere</string>
@@ -58,7 +58,7 @@
<string name="sk_delete_notification">Izbriši obavijesti</string>
<string name="sk_delete_notification_confirm_action">Izbriši obavijest</string>
<string name="sk_delete_notification_confirm">Jeste li sigurni da želite izbrisati ovu obavijest\?</string>
<string name="sk_enable_delete_notifications">Omogući brisanje obavijesti</string>
<string name="sk_settings_enable_delete_notifications">Omogući brisanje obavijesti</string>
<string name="sk_settings_publish_button_text">Tekst gumba za objavljivanje</string>
<string name="sk_settings_publish_button_text_title">Prilagodi tekst gumba za objavljivanje</string>
<string name="sk_schedule">Zakaži</string>