Commit 4c364944 authored by Thomas's avatar Thomas
Browse files

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

parents 9e42bf9c 339a7d76
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -1156,4 +1156,7 @@
    <string name="no_filters_available">Sen filtros dispoñibles. Crea un nos axustes.</string>
    <string name="filtered_statuses">Publicacións filtradas</string>
    <string name="see_discussions">Ver conversas</string>
    <string name="custom_emoji">Persoal</string>
    <string name="standard_emoji">Estándar</string>
    <string name="reactions">Reaccións</string>
</resources>
+4 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@
    <string name="settings_time_to">終了</string>
    <string name="embedded_browser">アプリ内ブラウザを使用する</string>
    <string name="custom_tabs">アプリ内ブラウザー</string>
    <string name="expand_cw">CWを自動的に展開する</string>
    <string name="expand_cw">CWを自動展開</string>
    <string name="set_led_colour">LEDの色:</string>
    <string-array name="led_colours">
        <item></item>
@@ -1159,4 +1159,7 @@
    <string name="no_filters_available">利用可能なフィルタがありません。最初に設定で作成して下さい。</string>
    <string name="filtered_statuses">フィルタされたポスト</string>
    <string name="see_discussions">ディスカッションを閲覧</string>
    <string name="custom_emoji">カスタム</string>
    <string name="standard_emoji">標準</string>
    <string name="reactions">リアクション</string>
</resources>
+3 −0
Original line number Diff line number Diff line
@@ -1157,4 +1157,7 @@
    <string name="no_filters_available">无过滤器可用。先在设置中创建一个。</string>
    <string name="filtered_statuses">过滤的嘟文</string>
    <string name="see_discussions">查看讨论</string>
    <string name="custom_emoji">自定义</string>
    <string name="standard_emoji">标准</string>
    <string name="reactions">辉映</string>
</resources>