mirror of
https://github.com/ArcaneChat/android.git
synced 2026-07-03 14:05:24 +02:00
fix merge conflicts
This commit is contained in:
+1
-1
@@ -1,6 +1,6 @@
|
||||
[main]
|
||||
host = https://www.transifex.com
|
||||
lang_map = nl_NL:nl
|
||||
lang_map = nl_NL:nl, ja_JP:ja
|
||||
|
||||
[delta-chat-app.stringsxml]
|
||||
file_filter = res/values-<lang>/strings.xml
|
||||
|
||||
+3
-4
@@ -64,10 +64,9 @@ dependencies {
|
||||
implementation 'com.codewaves.stickyheadergrid:stickyheadergrid:0.9.4' // glues the current time segment text in the gallery to the top.
|
||||
implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:7.2.0'
|
||||
|
||||
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.3'
|
||||
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
|
||||
debugImplementation 'com.squareup.leakcanary:leakcanary-support-fragment:1.6.3'
|
||||
|
||||
//debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.3'
|
||||
//releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
|
||||
//debugImplementation 'com.squareup.leakcanary:leakcanary-support-fragment:1.6.3'
|
||||
|
||||
testImplementation 'junit:junit:4.12'
|
||||
testImplementation 'junit:junit:4.12'
|
||||
|
||||
+1
-1
Submodule jni/messenger-backend updated: e7e9a8796d...86230cd4ae
Binary file not shown.
|
After Width: | Height: | Size: 78 KiB |
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="83dp">
|
||||
<item android:left="0dp">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/gray12" />
|
||||
<size android:height="1px" />
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:left="83dp">
|
||||
<item android:left="0dp">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="#33ffffff" />
|
||||
<size android:height="1px" />
|
||||
|
||||
@@ -18,26 +18,29 @@
|
||||
android:layout_gravity="center">
|
||||
|
||||
<Button
|
||||
style="@style/ButtonPrimary"
|
||||
android:background="@color/universal_overlay"
|
||||
android:id="@+id/set_default_button"
|
||||
android:layout_gravity="fill_vertical"
|
||||
style="@style/ButtonPrimary"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="40dp"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_margin="15dp"
|
||||
android:background="@color/universal_overlay"
|
||||
android:minWidth="200dp"
|
||||
android:text="Set default" />
|
||||
android:text="@string/pref_background_btn_default"
|
||||
android:textAllCaps="false" />
|
||||
|
||||
<Button
|
||||
style="@style/ButtonPrimary"
|
||||
android:background="@color/universal_overlay"
|
||||
android:id="@+id/from_gallery_button"
|
||||
android:layout_gravity="fill_vertical"
|
||||
style="@style/ButtonPrimary"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="40dp"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_margin="15dp"
|
||||
android:background="@color/universal_overlay"
|
||||
android:minWidth="200dp"
|
||||
android:text="From gallery" />
|
||||
android:text="@string/pref_background_btn_gallery"
|
||||
android:textAllCaps="false" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</FrameLayout>
|
||||
@@ -137,6 +137,6 @@
|
||||
<View android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:background="@drawable/attachment_selector_shadow"/>
|
||||
android:background="?attr/conversation_list_item_divider"/>
|
||||
|
||||
</org.thoughtcrime.securesms.ConversationListItem>
|
||||
|
||||
@@ -0,0 +1,310 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<!-- common strings without special context -->
|
||||
<string name="app_name">Delta Chat</string>
|
||||
<string name="ok">了承</string>
|
||||
<string name="cancel">取消</string>
|
||||
<string name="yes">はい</string>
|
||||
<string name="no">いいえ</string>
|
||||
<string name="on">入</string>
|
||||
<string name="off">切</string>
|
||||
<string name="def">標準</string>
|
||||
<string name="none">無し</string>
|
||||
<string name="open">開く</string>
|
||||
<string name="delete">削除</string>
|
||||
<string name="done">完了</string>
|
||||
<string name="undo">元に戻す</string>
|
||||
<string name="error">エラー</string>
|
||||
<string name="error_no_network">通信不能</string>
|
||||
<string name="no_browser_installed">ブラウザーが見つかりません</string>
|
||||
<string name="file_not_found">%1$sを見付けられません</string>
|
||||
<string name="copied_to_clipboard">クリップボードに複製しました</string>
|
||||
<string name="contacts_headline">連絡先</string>
|
||||
<string name="email_address">メールアドレス</string>
|
||||
<string name="password">パスワード</string>
|
||||
<string name="now">現在</string>
|
||||
<!-- n_min_ago is deprecated, use n_minutes instead -->
|
||||
<string name="n_min_ago">%d分</string>
|
||||
<string name="today">今日</string>
|
||||
<string name="yesterday">昨日</string>
|
||||
<string name="this_week">今週</string>
|
||||
<string name="this_month">今月</string>
|
||||
<string name="last_week">先週</string>
|
||||
<string name="last_month">先月</string>
|
||||
<!-- Translators: show beside messages that are "N minutes old". prefer a short string, prefer abbreviations if they're well-known -->
|
||||
<plurals name="n_minutes">
|
||||
<item quantity="other">%d分</item>
|
||||
</plurals>
|
||||
<!-- Translators: show beside messages that are "N hours old". prefer a short string, prefer abbreviations if they're well-known -->
|
||||
<plurals name="n_hours">
|
||||
<item quantity="other">%d時間</item>
|
||||
</plurals>
|
||||
<plurals name="n_chats">
|
||||
<item quantity="other">%d 個のチャット</item>
|
||||
</plurals>
|
||||
<plurals name="n_contacts">
|
||||
<item quantity="other">%d個の連絡先</item>
|
||||
</plurals>
|
||||
<plurals name="n_messages">
|
||||
<item quantity="other">%d個のメッセージ</item>
|
||||
</plurals>
|
||||
<plurals name="n_members">
|
||||
<item quantity="other">%d人のメンバー</item>
|
||||
</plurals>
|
||||
|
||||
<string name="self">自分</string>
|
||||
<string name="draft">下書き</string>
|
||||
<string name="image">画像</string>
|
||||
<string name="gif">Gif</string>
|
||||
<string name="images">画像</string>
|
||||
<string name="audio">音楽</string>
|
||||
<string name="voice_message">音声メッセージ</string>
|
||||
<string name="video">動画</string>
|
||||
<string name="documents">文章</string>
|
||||
<string name="contact">連絡先</string>
|
||||
<string name="camera">カメラ</string>
|
||||
<string name="location">場所</string>
|
||||
<string name="gallery">画像</string>
|
||||
<string name="file">ファイル</string>
|
||||
<string name="unknown">不明</string>
|
||||
|
||||
<string name="green">緑</string>
|
||||
<string name="red">赤</string>
|
||||
<string name="blue">青</string>
|
||||
<string name="orange">橙</string>
|
||||
<string name="cyan">青緑</string>
|
||||
<string name="purple">紫</string>
|
||||
<string name="magenta">赤紫</string>
|
||||
<string name="white">白</string>
|
||||
|
||||
<string name="small">小</string>
|
||||
<string name="normal">中</string>
|
||||
<string name="large">大</string>
|
||||
<string name="extra_large">巨大</string>
|
||||
|
||||
<string name="fast">高速</string>
|
||||
<string name="slow">低速</string>
|
||||
|
||||
<string name="message_delivered">送信済み</string>
|
||||
<string name="message_read">既読</string>
|
||||
|
||||
|
||||
<!-- menu labels (or icon, buttons...) -->
|
||||
<string name="menu_new_contact">新規連絡先</string>
|
||||
<string name="menu_new_chat">新規チャット</string>
|
||||
<string name="menu_new_group">新規グループ</string>
|
||||
<string name="menu_send">送信</string>
|
||||
<string name="menu_edit_group">グループを編集</string>
|
||||
<string name="menu_show_map">地図を見る</string>
|
||||
<string name="menu_archive_chat">チャットを保管</string>
|
||||
<string name="menu_unarchive_chat">チャットを取り出す</string>
|
||||
<string name="menu_leave_group">退室する</string>
|
||||
<string name="menu_delete_chat">チャットを削除</string>
|
||||
<string name="menu_delete_messages">メッセージを削除</string>
|
||||
<string name="menu_delete_image">画像を削除する</string>
|
||||
<string name="menu_message_details">メッセージの詳細</string>
|
||||
<string name="menu_copy_to_clipboard">クリップボードに複製</string>
|
||||
<string name="menu_forward">メッセージを転送</string>
|
||||
<string name="menu_resend">メッセージを再送信</string>
|
||||
<string name="menu_reply">メッセージに返答</string>
|
||||
<string name="menu_mute">通知しない</string>
|
||||
<string name="menu_all_media">全ての写真・動画・音楽</string>
|
||||
<string name="menu_share">共有</string>
|
||||
<string name="menu_block_contact">拒否する</string>
|
||||
<string name="menu_unblock_contact">拒否を解除</string>
|
||||
<string name="menu_play">再生</string>
|
||||
<string name="menu_pause">一時停止</string>
|
||||
<string name="menu_help">ヘルプ</string>
|
||||
<string name="menu_select_all">全選択</string>
|
||||
<string name="menu_settings">設定</string>
|
||||
<string name="menu_advanced">追加設定</string>
|
||||
<string name="menu_deaddrop">連絡先追加</string>
|
||||
<string name="menu_view_profile">詳細を確認</string>
|
||||
<string name="ask_block_contact">この連絡先を拒否しますか</string>
|
||||
<string name="ask_unblock_contact">この連絡先の拒否設定を解除しますか</string>
|
||||
<string name="ask_start_chat_with">Chat with %1$sとチャットしますか</string>
|
||||
|
||||
|
||||
<!-- contact list -->
|
||||
<string name="contacts_title">連絡先一覧</string>
|
||||
<string name="contacts_enter_name_or_email">名前かメールアドレスを入力</string>
|
||||
<string name="contacts_empty_hint">連絡先無し</string>
|
||||
|
||||
|
||||
<string name="chat_input_placeholder">メッセージ</string>
|
||||
<string name="chat_no_messages">メッセージ無し</string>
|
||||
<!-- search -->
|
||||
<string name="search">検索</string>
|
||||
<string name="search_explain">チャット・メッセージ・連絡先を検索</string>
|
||||
<string name="search_no_result_for_x">「%s」は見付かりませんでした。</string>
|
||||
|
||||
|
||||
<string name="media_tab_media">写真・動画・音楽</string>
|
||||
<string name="media_no_media_hint">写真・動画・音楽等無し</string>
|
||||
<string name="media_no_documents_hint">文章無し</string>
|
||||
|
||||
|
||||
<!-- welcome and login -->
|
||||
<string name="welcome_intro1_headline">Delta Chat</string>
|
||||
<string name="welcome_intro2_headline">独立</string>
|
||||
<string name="welcome_intro2_message">Delta Chatは自分のメールサーバーを設定して使用します。つまりはチャット風のメールクライアントアプリケーションであると謂う事です。</string>
|
||||
<string name="welcome_intro3_headline">高速</string>
|
||||
<string name="welcome_intro4_headline">強力</string>
|
||||
<!-- Translators: "free" as in freedom here, not "free" as in "free beer" -->
|
||||
<string name="welcome_intro5_headline">自由で</string>
|
||||
<!-- Translators: "free" as in freedom here, not "free" as in "free beer" -->
|
||||
<string name="welcome_intro5_message">Delta Chatはあの世の終わりまで無料です。またソフトウェアのソースコードを公開しています。寄付によって開発されているため広告等は混入していません。</string>
|
||||
<string name="welcome_intro6_headline">暗号通信</string>
|
||||
<string name="welcome_intro6_message">メッセージは一般的な方式で暗号化され自分のサーバーに保存されます。</string>
|
||||
<string name="welcome_intro7_headline">信頼</string>
|
||||
<string name="welcome_intro7_message">Delta Chatは商用としても安全に使用できます。標準規格のメールサーバーに対応し、PGPを使用しています。</string>
|
||||
<string name="welcome_start_messaging">開始する</string>
|
||||
<string name="login_title">ログイン</string>
|
||||
<string name="login_header">自分のメールサーバーにログインする</string>
|
||||
<string name="login_subheader">有名なメールサーバーは自動で設定されます。一般にIMAPはサーバー側で有効に設定する必要が有ります。サーバー提供者や詳しい人に確認しましょう。</string>
|
||||
<string name="login_no_servers_hint">Delta Chatには専用サーバーが有りません。つまりあなたのデータ・個人情報はこの端末の中と自分のメールサーバー内で保管されます。</string>
|
||||
<string name="login_inbox">受信</string>
|
||||
<string name="login_imap_login">IMAPログイン名</string>
|
||||
<string name="login_imap_server">IMAPサーバー</string>
|
||||
<string name="login_imap_port">IMAPポート</string>
|
||||
<string name="login_imap_security">IMAP 暗号方式</string>
|
||||
<string name="login_outbox">送信</string>
|
||||
<string name="login_smtp_login">SMTPログイン名</string>
|
||||
<string name="login_smtp_password">SMTPパスワード</string>
|
||||
<string name="login_smtp_server">SMTPサーバー</string>
|
||||
<string name="login_smtp_port">SMTPポート</string>
|
||||
<string name="login_smtp_security">SMTP暗号方式</string>
|
||||
<!-- preferences -->
|
||||
<string name="pref_summary_on">入</string>
|
||||
<string name="pref_summary_off">切</string>
|
||||
<string name="pref_summary_default">標準</string>
|
||||
<string name="pref_your_name">あなたの名前</string>
|
||||
<!-- Translators: The value entered here is visible only to recipients who DO NOT use Deltachat, so its not a "Status" but the last line in the E-Mail. -->
|
||||
<string name="pref_default_status_label">署名</string>
|
||||
<!-- Translators: The URL should not be localized, it is not clear which language the receiver prefers and the language will be detected on the server -->
|
||||
<string name="pref_default_status_text">Delta Chat Messengerから送信しております。
|
||||
https://delta.chat</string>
|
||||
<string name="pref_vibrate">振動</string>
|
||||
<string name="pref_chat_settings">チャット設定</string>
|
||||
<string name="pref_notifications">通知</string>
|
||||
<string name="pref_notifications_priority">優先度</string>
|
||||
<string name="pref_led_color">LED色</string>
|
||||
<string name="pref_sound">通知音</string>
|
||||
<string name="pref_silent">無音</string>
|
||||
<string name="pref_privacy">機密保護</string>
|
||||
<string name="pref_chats_and_media">チャットと写真・動画・音楽</string>
|
||||
<!-- Translators: "light" in the meaning "opposite of dark" -->
|
||||
<string name="pref_light_theme">白</string>
|
||||
<string name="pref_dark_theme">黒</string>
|
||||
<string name="pref_appearance">外観</string>
|
||||
<string name="pref_theme">見た目</string>
|
||||
<string name="pref_language">言語</string>
|
||||
<string name="pref_chats">チャット</string>
|
||||
<string name="pref_messages">メッセージ</string>
|
||||
<string name="pref_in_chat_sounds">着信音</string>
|
||||
<string name="pref_message_text_size">文字の大きさ</string>
|
||||
<string name="pref_other">その他</string>
|
||||
<!-- autocrypt -->
|
||||
<string name="autocrypt">自動暗号化</string>
|
||||
<string name="autocrypt_explain">自動暗号化機能は新しくて開けた仕様での一対一のメール暗号化を行います。\n \n この一対一暗号化は自動暗号化設定用メッセージを転送して設定します。</string>
|
||||
<string name="autocrypt_send_asm_title">自動暗号化設定用メッセージを送信する</string>
|
||||
<string name="autocrypt_send_asm_explain_before">「自動暗号化設定用メッセージ」は安全に一対一暗号化設定を対応するアプリケーションとの間に設定します。\n \n 受信側は設定時に表示されるパスコードを入力する必要が有ります。</string>
|
||||
<string name="autocrypt_send_asm_button">自動暗号化設定用メッセージを送信する</string>
|
||||
<string name="autocrypt_asm_subject">自動暗号化設定用メッセージ</string>
|
||||
<string name="autocrypt_continue_transfer_title">自動暗号化設定用メッセージ</string>
|
||||
<!-- qr code stuff -->
|
||||
<string name="qrscan_title">QRコードを読み取る</string>
|
||||
<string name="qrscan_hint">QRコードを読み取って下さい</string>
|
||||
<string name="qrscan_contains_text">読み取り結果は以下:\n\n%1$s</string>
|
||||
<string name="qrscan_contains_url">読み取り結果は以下:\n\n:\n\n%1$s</string>
|
||||
<string name="qrshow_title">自分のQRコード</string>
|
||||
<string name="qrshow_x_joining">%1$sが参加しました</string>
|
||||
<string name="qrshow_join_group_title">自分のQRコード</string>
|
||||
<string name="qrshow_join_contact_title">自分のQRコード</string>
|
||||
<string name="notify_new_message">新規メッセージ</string>
|
||||
<string name="notify_name_and_message">名前とメッセージ</string>
|
||||
<string name="notify_name_only">名前のみ</string>
|
||||
<string name="notify_repeat_one_time">一回</string>
|
||||
<string name="notify_repeat_two_times">二回</string>
|
||||
<string name="notify_repeat_three_times">三回</string>
|
||||
<string name="notify_repeat_five_times">五回</string>
|
||||
<string name="notify_repeat_ten_times">十回</string>
|
||||
|
||||
|
||||
<!-- languages -->
|
||||
<string name="language_be">ベルギー語</string>
|
||||
<string name="language_ca">カタルーニャ語</string>
|
||||
<string name="language_da">デンマーク語</string>
|
||||
<string name="language_de">ドイツ語</string>
|
||||
<string name="language_en">英語</string>
|
||||
<string name="language_eo">エスペラント語</string>
|
||||
<string name="language_es">スペイン(カステーリャ)語</string>
|
||||
<string name="language_eu">バスク語</string>
|
||||
<string name="language_fr">フランス語</string>
|
||||
<string name="language_hr">クロアチア語</string>
|
||||
<string name="language_hu">ハンガリー語</string>
|
||||
<string name="language_it">イタリア語</string>
|
||||
<string name="language_id">インドネシア語</string>
|
||||
<string name="language_ja_JP">日本語</string>
|
||||
<string name="language_ko">トンスル語</string>
|
||||
<string name="language_nb_NO">ノルウェー語ブーケモール</string>
|
||||
<string name="language_nl">オランダ語</string>
|
||||
<string name="language_nl_NL">オランダ語</string>
|
||||
<string name="language_pl">ポーランド語</string>
|
||||
<string name="language_pt">ポルトガル語</string>
|
||||
<string name="language_ru">ロシア語</string>
|
||||
<string name="language_ru_RU">ロシア語</string>
|
||||
<string name="language_sq">アルバニア語</string>
|
||||
<string name="language_sr">セルビア語</string>
|
||||
<string name="language_sv">スウェーデン語</string>
|
||||
<string name="language_ta">タミル語</string>
|
||||
<string name="language_te">テルグ語</string>
|
||||
<string name="language_tr">トルコ語</string>
|
||||
<string name="language_uk">ウクライナ語</string>
|
||||
<string name="language_zh_CN">中国語</string>
|
||||
|
||||
<!-- desktop specific strings -->
|
||||
<string name="welcome_desktop">DeltaChatへようこそ</string>
|
||||
<string name="login_known_accounts_title_desktop">不明なアカウント</string>
|
||||
<string name="global_menu_preferences_language_desktop">言語を選択して下さい</string>
|
||||
<string name="global_menu_file_desktop">ファイルを</string>
|
||||
<string name="global_menu_file_quit_desktop">終了</string>
|
||||
<string name="global_menu_edit_desktop">編集</string>
|
||||
<string name="global_menu_edit_undo_desktop">元に戻す</string>
|
||||
<string name="global_menu_edit_redo_desktop">やり直す</string>
|
||||
<string name="global_menu_edit_cut_desktop">切り取り</string>
|
||||
<string name="global_menu_edit_copy_desktop">複製</string>
|
||||
<string name="global_menu_edit_paste_desktop">貼り付け</string>
|
||||
<string name="global_menu_edit_delete_desktop">削除</string>
|
||||
<string name="global_menu_edit_selectall_desktop">全選択</string>
|
||||
<string name="global_menu_view_developer_desktop">開発者</string>
|
||||
<string name="global_menu_view_developer_tools_desktop">開発者ツール</string>
|
||||
<string name="global_menu_help_desktop">ヘルプ</string>
|
||||
<string name="global_menu_help_learn_desktop">DeltaChatについて詳しく知る</string>
|
||||
<string name="global_menu_help_contribute_desktop">GitHubで貢献する</string>
|
||||
<string name="global_menu_help_report_desktop">問題を報告する</string>
|
||||
<string name="global_menu_help_about_desktop">概要</string>
|
||||
<string name="about_deltachat_heading_desktop">概要</string>
|
||||
<string name="contact_detail_title_desktop">連絡先の詳細</string>
|
||||
<string name="timestamp_format_m_desktop">MMM D</string>
|
||||
<string name="no_chats_desktop">チャット無し</string>
|
||||
<string name="show_qr_verify_code_desktop">自分のQRコードを見る</string>
|
||||
<string name="show_qr_invite_code_desktop">自分のQRコードを見る</string>
|
||||
<string name="add_contact_desktop">連絡先を追加</string>
|
||||
<string name="name_desktop">名前</string>
|
||||
<string name="reply_to_message_desktop">メッセージに返答</string>
|
||||
<string name="email_validation_failed_desktop">メールアドレスが必要です</string>
|
||||
<string name="me_desktop">自分</string>
|
||||
<string name="message_detail_sent_desktop">送信済み</string>
|
||||
<string name="user_location_permission_explanation">Delta Chatは位置情報を共有出来る様にする為権限が必要です</string>
|
||||
|
||||
<!-- deprecated on android, please remove if unused on desktop -->
|
||||
<!-- see qrscan_ask_join_group -->
|
||||
<string name="qrscan_ask_join_verified_group">%1$sに参加しますか</string>
|
||||
<!-- see ask_start_chat_with -->
|
||||
<string name="qrscan_ask_fingerprint_ask_oob">%1$sとチャットしますか</string>
|
||||
<!-- see ask_start_chat_with -->
|
||||
<string name="qrscan_ask_chatting_fingerprint_ok">%1$sとチャットしますか</string>
|
||||
<!-- see qrshow_join_group_title -->
|
||||
<string name="qrshow_join_verified_group_title">自分のQRコードを見る</string>
|
||||
</resources>
|
||||
@@ -14,6 +14,7 @@
|
||||
<!-- eu --><item>Euskara</item>
|
||||
<!-- fr --><item>Français</item>
|
||||
<!-- it --><item>Italiano</item>
|
||||
<!-- ja --><item>Japanese 日本語</item>
|
||||
<!-- lt --><item>Lietuvių kalba</item>
|
||||
<!-- nl --><item>Nederlands</item>
|
||||
<!-- pl --><item>Polski</item>
|
||||
@@ -35,6 +36,7 @@
|
||||
<item>eu</item>
|
||||
<item>fr</item>
|
||||
<item>it</item>
|
||||
<item>ja</item>
|
||||
<item>lt</item>
|
||||
<item>nl</item>
|
||||
<item>pl</item>
|
||||
|
||||
@@ -394,6 +394,8 @@
|
||||
<string name="pref_managekeys_secret_keys_exported_to_x">Secret keys written successfully to \"%1$s\".</string>
|
||||
<string name="pref_managekeys_secret_keys_imported_from_x">Secret keys imported from \"%1$s\".</string>
|
||||
<string name="pref_background">Background</string>
|
||||
<string name="pref_background_btn_default">Use default image</string>
|
||||
<string name="pref_background_btn_gallery">Select from gallery</string>
|
||||
<string name="pref_imap_folder_handling">IMAP folder handling</string>
|
||||
<string name="pref_imap_folder_warn_disable_defaults">If you disable this option, make sure, your server and your other clients are configured accordingly.\n\nOtherwise things may not work at all.</string>
|
||||
<string name="pref_watch_inbox_folder">Watch Inbox folder</string>
|
||||
|
||||
@@ -289,7 +289,7 @@
|
||||
<item name="import_export_item_background_shadow_color">@color/import_export_item_background_shadow_dark</item>
|
||||
<item name="import_export_item_card_background">@drawable/clickable_card_dark</item>
|
||||
|
||||
<item name="fab_color">@color/gray95</item>
|
||||
<item name="fab_color">@color/gray78</item>
|
||||
<item name="input_panel_bg_color">@color/gray95</item>
|
||||
<item name="lower_right_divet">@drawable/divet_lower_right_light</item>
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ import org.thoughtcrime.securesms.util.ScreenLockUtil;
|
||||
import org.thoughtcrime.securesms.util.Util;
|
||||
import org.thoughtcrime.securesms.util.SignalProtocolLoggerProvider;
|
||||
import org.thoughtcrime.securesms.util.AndroidSignalProtocolLogger;
|
||||
import com.squareup.leakcanary.LeakCanary;
|
||||
//import com.squareup.leakcanary.LeakCanary;
|
||||
|
||||
public class ApplicationContext extends Application implements DefaultLifecycleObserver {
|
||||
|
||||
@@ -40,12 +40,13 @@ public class ApplicationContext extends Application implements DefaultLifecycleO
|
||||
public void onCreate() {
|
||||
super.onCreate();
|
||||
|
||||
if (LeakCanary.isInAnalyzerProcess(this)) {
|
||||
// This process is dedicated to LeakCanary for heap analysis.
|
||||
// You should not init your app in this process.
|
||||
return;
|
||||
}
|
||||
LeakCanary.install(this);
|
||||
// if (LeakCanary.isInAnalyzerProcess(this)) {
|
||||
// // This process is dedicated to LeakCanary for heap analysis.
|
||||
// // You should not init your app in this process.
|
||||
// return;
|
||||
// }
|
||||
// LeakCanary.install(this);
|
||||
|
||||
System.loadLibrary("native-utils");
|
||||
dcContext = new ApplicationDcContext(this);
|
||||
|
||||
|
||||
@@ -753,7 +753,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
|
||||
Drawable image = Drawable.createFromPath(backgroundImagePath);
|
||||
getWindow().setBackgroundDrawable(image);
|
||||
}
|
||||
else if(!dynamicTheme.isDarkTheme(this)) {
|
||||
else if(dynamicTheme.isDarkTheme(this)) {
|
||||
getWindow().setBackgroundDrawableResource(R.drawable.background_hd_dark);
|
||||
}
|
||||
else {
|
||||
getWindow().setBackgroundDrawableResource(R.drawable.background_hd);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -169,8 +169,8 @@ public class ChatBackgroundActivity extends PassphraseRequiredActionBarActivity
|
||||
|
||||
private void setDefaultLayoutBackgroundImage() {
|
||||
if(dynamicTheme.isDarkTheme(this)) {
|
||||
preview.setImageDrawable(null);
|
||||
preview.setBackgroundColor(Color.BLACK);
|
||||
Drawable image = getResources().getDrawable(R.drawable.background_hd_dark);
|
||||
preview.setImageDrawable(image);
|
||||
}
|
||||
else {
|
||||
Drawable image = getResources().getDrawable(R.drawable.background_hd);
|
||||
|
||||
@@ -10,7 +10,7 @@ cp res/values/strings.xml res/values-$LANG/strings.xml
|
||||
# and does not overwrite old file)
|
||||
touch -d "100 days ago" res/values-$LANG/strings.xml
|
||||
|
||||
echo "res/values/$LANG/strings.xml added:"
|
||||
echo "res/values-$LANG/strings.xml added:"
|
||||
echo "- add the name to res/values/arrays.xml"
|
||||
echo "- if needed, language mappings can be added to .tx/config"
|
||||
echo "- tx pull"
|
||||
|
||||
Reference in New Issue
Block a user