Commit 2edb2759 authored by Thomas's avatar Thomas
Browse files

Merge remote-tracking branch 'origin/develop' into develop

parents a8eb33f3 0f2b5db0
Loading
Loading
Loading
Loading
+272 −197

File changed.

Preview size limit exceeded, changes collapsed.

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@
    <string name="poxy_password">Facal-faire</string>
    <string name="context_notification">Brathan</string>
    <string name="share">Co-roinn</string>
    <string name="account_created_message">"  "</string>
    <string name="notif_display_mentions">Iomraidhean</string>
    <string name="notif_display_favourites">Annsachdan</string>
    <string name="yes">Tha</string>
+4 −4
Original line number Diff line number Diff line
@@ -32,10 +32,10 @@
    <string name="text_size">Szöveg és ikon méret</string>
    <string name="next">Következő</string>
    <string name="previous">Előző</string>
    <string name="open_with">Megnyitás a következővel:</string>
    <string name="open_with">Megnyitás a következővel</string>
    <string name="validate">Jóváhagyás</string>
    <string name="media">Média</string>
    <string name="share_with">Megosztás a következővel:</string>
    <string name="share_with">Megosztás a következővel</string>
    <string name="shared_via">Megosztva a Fedilabon keresztül</string>
    <string name="replies">Válaszok</string>
    <string name="username">Felhasználónév</string>
@@ -207,8 +207,8 @@
    <string name="set_lock_account">Fiók zárolása</string>
    <string name="set_save_changes">Változások mentése</string>
    <string name="set_fit_preview">Előnézeti képek méretre szabása</string>
    <string name="settings_time_from">Kezdet:</string>
    <string name="settings_time_to">Befejezés:</string>
    <string name="settings_time_from">Kezdet</string>
    <string name="settings_time_to">Befejezés</string>
    <string name="embedded_browser">Beépített böngésző használata</string>
    <string name="custom_tabs">Egyéni lapok</string>
    <string name="expand_cw">cw automatikus kibontása</string>
+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@
    <string name="embedded_browser">내장 브라우저 사용</string>
    <string name="custom_tabs">커스텀 탭</string>
    <string name="expand_cw">CW를 자동으로 펼침</string>
    <string name="set_led_colour">LED 색 설정</string>
    <string name="set_led_colour">LED 색 설정:</string>
    <string-array name="led_colours">
        <item>파란색</item>
        <item>청록색</item>
+4 −4
Original line number Diff line number Diff line
@@ -582,19 +582,19 @@
    <string name="stop_recording">Stopp opptak</string>
    <string name="set_accounts_page">Antall kontoer per innlasting</string>
    <string name="category_music">Musikk</string>
    <string name="cannot_be_empty">Dette feltet må fylles ut.</string>
    <string name="cannot_be_empty">Dette feltet må fylles ut!</string>
    <string name="replace_twitter">Twitter</string>
    <string name="replace_youtube">YouTube</string>
    <string name="replace_twitter_host">Domene for Twitter-grenseflate</string>
    <string name="replace_instagram_description">Bruk en alternativ grenseflate for Instagram</string>
    <string name="other">Annet</string>
    <string name="add_status">Legg til status</string>
    <string name="is_up">Er oppe.</string>
    <string name="is_up">Er oppe!</string>
    <string name="instance_health_uptime">Oppetid: %,.2f %%</string>
    <string name="keepon">Fortsett</string>
    <string name="category_custom">Tilpasset</string>
    <string name="followers_only">Kun følgere</string>
    <string name="is_down">Er nede.</string>
    <string name="is_down">Er nede!</string>
    <string name="instance_health_checkedat">Sjekket: %s</string>
    <string name="report_1_mute_title">Forstum %1$s</string>
    <string name="report_1_block_title">Blokker %1$s</string>
@@ -604,7 +604,7 @@
\n %s brukere - %s statuser</string>
    <string name="replace_youtube_description">Bruk en alternativ grenseflate for YouTube</string>
    <string name="replace_youtube_host">Domene for YouTube-grenseflate</string>
    <string name="instance_not_valid">Instansen ser ikke ut til å være gyldig.</string>
    <string name="instance_not_valid">Instansen ser ikke ut til å være gyldig!</string>
    <string name="boosted_by">Framhevet av</string>
    <string name="favourited_by">Favorittmerket av</string>
    <string name="eg_sensitive_content">F.eks: Sensitivt innhold</string>
Loading