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

This commit is contained in:
tom79 2019-11-16 15:16:43 +01:00
commit 50c942bf63
2 changed files with 12 additions and 12 deletions

View File

@ -1040,8 +1040,8 @@ https://yandex.ru/legal/confidential/?lang=en </string>
<string name="theme_file_error">Se produjo un error al seleccionar el archivo de tema</string>
<string name="export_bookmarks">Exportar marcadores a la instancia</string>
<string name="import_bookmarks">Importar marcadores de la instancia</string>
<string name="user_count">User count</string>
<string name="status_count">Status count</string>
<string name="instance_count">Instance count</string>
<string name="blocked">Blocked</string>
<string name="user_count">Número de usuarios</string>
<string name="status_count">Número de estados</string>
<string name="instance_count">Número de instancias</string>
<string name="blocked">Bloqueado</string>
</resources>

View File

@ -1005,8 +1005,8 @@ Yandex 有適當的隱私權政策可以在這裡找到https://yandex.ru/l
<string name="link_color_title">連結</string>
<string name="link_color">在訊息中變更連結的顏色URL、提及、標籤等等</string>
<string name="boost_header_color_title">轉發標頭</string>
<string name="displayname_title">Change the color of display name at the top of messages</string>
<string name="username_title">Change the color of the user name at the top of messages</string>
<string name="displayname_title">更改訊息頂部的顯示名稱色彩</string>
<string name="username_title">更改訊息頂部的使用者名稱色彩</string>
<string name="boost_header_color">變更轉發標頭的顏色</string>
<string name="background_status_title">貼文</string>
<string name="background_status">時間軸中貼文的背景顏色</string>
@ -1040,10 +1040,10 @@ Yandex 有適當的隱私權政策可以在這裡找到https://yandex.ru/l
<string name="export_theme">匯出佈景主題</string>
<string name="export_theme_title">點擊這裡以匯出目前的佈景主題</string>
<string name="theme_file_error">選取佈景主題檔案時遇到錯誤</string>
<string name="export_bookmarks">Export bookmarks to the instance</string>
<string name="import_bookmarks">Import bookmarks from the instance</string>
<string name="user_count">User count</string>
<string name="status_count">Status count</string>
<string name="instance_count">Instance count</string>
<string name="blocked">Blocked</string>
<string name="export_bookmarks">匯出書籤到站臺</string>
<string name="import_bookmarks">從站臺匯入書籤</string>
<string name="user_count">使用者數量</string>
<string name="status_count">狀態數量</string>
<string name="instance_count">站臺數量</string>
<string name="blocked">已阻擋</string>
</resources>