From 2a731731767b341af2785532c17bfa9ed71710d0 Mon Sep 17 00:00:00 2001 From: Erkan Date: Sun, 22 Mar 2015 20:09:53 +0100 Subject: Update french translation --- src/main/res/values-fr/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/main/res') diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 69440362..47c28517 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -427,4 +427,8 @@ Aucune application trouvée pour afficher la position Position Position reçue + + %d contact séléctionné + %d contacts séléctionnés + -- cgit v1.2.3 From e64049c4fc0f4514dee011a1f616ea4bdff1f16a Mon Sep 17 00:00:00 2001 From: BrianBlade Date: Wed, 1 Apr 2015 12:14:05 +0200 Subject: Add toggle account-state switch Add a switch to AccountAdapter that allows self-contained enabling/disabling of accounts without the need to bring up the context-menu --- src/main/res/layout/account_row.xml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/main/res') diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml index 60b69090..1cd29d59 100644 --- a/src/main/res/layout/account_row.xml +++ b/src/main/res/layout/account_row.xml @@ -41,4 +41,12 @@ android:textStyle="bold" /> + + \ No newline at end of file -- cgit v1.2.3 From 64d6a2970e687c4d1931fa6ccb4a9917a61ed1d5 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Wed, 1 Apr 2015 20:26:28 +0200 Subject: pulled translations from transifex --- src/main/res/values-de/strings.xml | 12 +- src/main/res/values-es/strings.xml | 4 + src/main/res/values-eu/strings.xml | 4 + src/main/res/values-ja/strings.xml | 433 +++++++++++++++++++++++++++++++++++++ src/main/res/values-sk/strings.xml | 5 + src/main/res/values-sr/strings.xml | 9 +- src/main/res/values-sv/strings.xml | 14 +- 7 files changed, 466 insertions(+), 15 deletions(-) create mode 100644 src/main/res/values-ja/strings.xml (limited to 'src/main/res') diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 0dd9f401..b8266182 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -121,13 +121,13 @@ Annehmen Ein unbekannter Fehler ist aufgetreten Online-Status - Erlaube neu hinzugefügten Kontakten deinen online-Status zu sehen und frage um Erlaubnis, ihren sehen zu dürfen + Erlaube neu hinzugefügten Kontakten meinen Online-Status zu sehen und frage um Erlaubnis, ihren sehen zu dürfen Abonnements Dein Konto Schlüssel - Anwesenheitsbenachrichtigungen senden - Empfange Anwesenheitsbenachrichtigungen - Frage um Erlaubnis, Anwesenheitsbenachrichtigungen sehen zu dürfen + Online-Status senden + Online-Status empfangen + Online-Status anfragen Bild auswählen Bild aufnehmen Erlaube Statusanfrage vorab @@ -255,12 +255,12 @@ Konferenz ist passwortgeschützt Passwort eingeben Fehlender Online-Status vom Kontakt - Bitte erst Anwesenheitsbenachrichtigungen vom Kontakt anfordern.\n\n + Bitte erst Online-Status vom Kontakt anfragen.\n\nDies wird verwendet, um festzustellen, welche Client(s) der Kontakt benutzt. Jetzt anfordern Fingerabdruck löschen Soll dieser Fingerabdruck gelöscht werden? Ignorieren - Achtung: Es kann zu unerwarteten Problemen führen, dies ohne gegenseitige Anwesenheitsbenachrichtigungen abzusenden.\n\nBitte die Online-Status-Abonnements in den Kontaktdetails prüfen. + Achtung: Ohne gegenseitig den Online-Status zu kennen, kann es zu unerwarteten Problemen kommen.\n\nBitte die Einstellungen in den Kontakt-Details prüfen. Verschlüsselungs-Einstellungen Ende-zu-Ende-Verschlüsselung erzwingen Nachrichten immer verschlüsseln (außer für Konferenzen) diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 639eddfa..44d8abb2 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -427,4 +427,8 @@ No se ha encontrado ninguna aplicación para mostrar la ubicación Ubicación Ubicación recibida + + Seleccionado %d contacto + Seleccionados %d contactos + diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index 4d81c1bf..b6d1fa3c 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -427,4 +427,8 @@ Kokapena erakutsi dezakeen aplikaziorik ez da aurkitu Kokapena Kokapena jaso da + + Hautatu kontaktu %d + Hautatu %d kontaktu + diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml new file mode 100644 index 00000000..baffa088 --- /dev/null +++ b/src/main/res/values-ja/strings.xml @@ -0,0 +1,433 @@ + + + 設定 + 新しい会話 + アカウントの管理 + この会話を終了 + 連絡先の詳細 + 会議の詳細 + 安全に会話 + アカウントを追加 + 名前の編集 + 電話帳に追加 + 名簿から削除 + 連絡先をブロック + 連絡先のブロックを解除 + ドメインをブロック + ドメインのブロックを解除 + アカウントの管理 + 設定 + 会議の詳細 + 連絡先の詳細 + 会話で共有 + 会話の開始 + 連絡先の選択 + ブロックリスト + ちょうど今 + 1 分前 + %d 分前 + 未読の会話 + 送信中… + メッセージを復号しています。しばらくお待ちください… + ニックネームは既に使用されています + 管理者 + オーナー + モデレーター + 参加者 + ビジター + あなたの名簿から %s を削除しますか? この連絡先と関連した会話は削除されません。 + %s からあなたに送信されるメッセージをブロックしますか? + %s のブロックを解除し、あなたにメッセージを送信できるようにしますか? + %s からの連絡をすべてブロックしますか? + %s からの連絡をすべてブロック解除しますか? + 連絡先をブロックしました + ブックマークとして %s を削除しますか? このブックマークに関連した会話は削除されません。 + サーバーに新しいアカウントを登録 + サーバーのパスワードを変更 + …で共有 + 会話を開始 + 連絡先を招待 + 連絡先 + キャンセル + 設定 + 追加 + 編集 + 削除 + ブロック + ブロックを解除 + 保存 + OK + Conversations がクラッシュしました + Conversations の継続的な開発を支援するために、スタックトレースをお送りください。\n警告: あなたのXMPPアカウントを使用して、開発者にスタックトレースを送信します。 + 今すぐ送信 + 今後表示しない + アカウントに接続できません + 複数のアカウントに接続できません + ここをタッチして、アカウントの管理 + 添付ファイル + 連絡先が名簿にありません。追加しますか? + 連絡先を追加 + 配信に失敗しました + 拒否されました + 転送用画像の準備中 + 履歴をクリア + 会話履歴をクリア + この会話のすべてのメッセージを削除しますか?\n\n警告: これは、他のデバイスやサーバーに保存されているメッセージには影響しません。 + メッセージを削除 + その後、この会話を終了 + 連絡する参加を選択 + プレーンテキストを送信 + OTR 暗号化メッセージを送信 + OpenPGP 暗号化メッセージを送信 + あなたのニックネームが変更されました + 画像のダウンロード + 暗号化されていない送信 + 復号化に失敗しました。おそらく秘密鍵が正しくないようです。 + OpenKeychain + Conversations は OpenKeychain と呼ばれるサードパーティのアプリを利用して、メッセージの暗号化および復号化、そしてあなたの公開鍵を管理します。\n\nOpenKeychain は GPLv3 ライセンスの下で、F-Droid および Google Play から利用可能です。\n\n(後で Conversations を再起動してください。) + 再起動 + インストール + 依頼中… + 待機中… + OpenPGP の鍵はありません + 連絡先が公開鍵を通知しないため、Conversations はあなたのメッセージを暗号化することができません。\n\n連絡先に OpenPGP をセットアップするように依頼してください。 + OpenPGP の鍵はありません + 連絡先が公開鍵を通知しないため、Conversations はあなたのメッセージを暗号化することができません。\n\n連絡先に OpenPGP をセットアップするように依頼してください。 + 暗号化されたメッセージを受信しました。タッチすると、表示および復号化します。 + 全般 + XMPP リソース + 自分自身を識別するこのクライアントの名前 + ファイルを受取 + 自動的に小さいファイルを受取… + 通知設定 + 通知 + 新しいメッセージが到着したときに通知します + 振動 + 新しいメッセージが到着したときに振動もします + サウンド + 通知で着信音を再生します + 会議通知 + 新しい会議メッセージが到着したとき、ハイライト表示ではなく、常に通知します + 通知猶予期間 + カーボンコピーを受信した後、短時間、通知を無効にします + 詳細オプション + クラッシュレポートを送信しない + スタックトレースを送信することで、あなたは Conversations の継続的な開発を支援しています + メッセージの確認 + あなたがメッセージを受け取って読んだことを、連絡先に知らせます + UI オプション + OpenKeychain がエラーを報告しました + ファイルの復号化中に I/O エラー + 受付 + エラーが発生しました + 参加アップデートの権限を付与 + 事前に、作成した連絡先に対して権限を付与して、参加のサブスクリプションを求めます + サブスクリプション + あなたのアカウント + 鍵 + 参加アップデートを送信 + 参加アップデートを受信 + 参加アップデートを問合せ + 写真の選択 + 写真の撮影 + 事前にサブスクリプション要求を許可する + 選択したファイルは画像ではありません + 画像ファイルの変換中にエラー + ファイルが見つかりません + 一般的な I/O エラー。おそらく空き容量がなくなっていませんか? + 選択した画像ファイルは、読み取りに必要なアクセス権がありません。\n\n別のファイルマネージャを使用して、画像を選択してください。 + 不明 + 一時的に無効 + オンライン + 接続中\u2026 + オフライン + 許可されていません + サーバーが見つかりません + 接続エラー + 登録に失敗しました + ユーザー名はすでに使用されています + 登録が完了しました + サーバーが登録をサポートしていません + セキュリティ エラー + 互換性のないサーバー + プレーンテキスト + OTR + OpenPGP + アカウントの編集 + アカウントを削除 + 一時的に無効にする + アバターを公開 + OpenPGP 公開鍵を公開 + アカウントを有効にする + よろしいですか? + アカウントを削除するとあなたの会話履歴がすべて失われます + 音声を録音 + Jabber ID + パスワード + username@example.com + パスワードを確認 + パスワード + パスワードを確認 + パスワードが一致しません + これは有効な Jabber ID ではありません + メモリ不足です。画像が大きすぎます + 電話の連絡先リストに %s を追加しますか? + オンライン + 自由にチャットできます + 離席中 + 長時間離席中 + じゃましないで + オフライン + 会議 + 他のメンバー + サーバー情報 + XEP-0313: メッセージ アーカイブ管理 + XEP-0280: メッセージ カーボン + XEP-0352: クライアント状態表示 + XEP-0191: ブロッキング コマンド + XEP-0237: 名簿バージョニング + XEP-0198: ストリーム管理 + XEP-0163: 個人イベントプロトコル (アバター) + 利用可能 + 利用不可 + 公開鍵の通知がありません + ちょうど今会いました + 1 分前に会いました + %d 分前に会いました + 1 時間前に会いました + %d 時間前に会いました + 1 日前に会いました + %d 日前に会いました + 会ったことはありません + 暗号化されたメッセージ。復号化するには OpenKeychain をインストールしてください。 + 不明な OTR フィンガープリント + OpenPGP 暗号化されたメッセージが見つかりました + 受信に失敗しました + あなたのフィンガープリント + OTR フィンガープリント + 検証 + 復号化 + 会議 + 検索 + 連絡先を作成 + 会議に参加 + 連絡先を削除 + 連絡先の詳細を表示 + 連絡先をブロック + 連絡先のブロックを解除 + 作成 + 連絡先はすでに存在します + 参加 + 会議アドレス + room@conference.example.com + ブックマークとして保存 + ブックマークを削除 + このブックマークはすでに存在します + あなた + 会議の件名を編集 + 会議が見つかりません + 退出 + 連絡先があなたを連絡先リストに追加しました + 戻りを追加 + %s はここまで読みました + 公開 + アバターをタッチしてギャラリーから画像を選択します + ご注意ください: あなたの参加アップデートを登録している人は、誰でもこの絵を見ることができます。 + 公開中… + サーバーがあなたの公開を拒否しました + 写真の変換中に、何か問題が発生しました + ディスクにアバターを保存できませんでした + (または長押しするとデフォルトに戻します) + ご利用のサーバーは、アバターの公開をサポートしていません + ささやいた + %s に + プライベートメッセージを %s に送信 + 接続 + このアカウントはすでに存在します + 次へ + 現在のセッションが確立 + 追加情報 + スキップ + 通知を無効にする + この会話の通知を無効にします + 通知を無効にしました + 有効 + 会議はパスワードが必要です + パスワードを入力してください + 連絡先からの参加アップデートがありません + 最初に連絡先から参加アップデートを要求してください。\n\nこれは、連絡先が何のクライアントを使用しているかを決めるために使用されます。 + 今すぐ要求 + フィンガープリントを削除 + このフィンガープリントを削除してもよろしいですか? + 無視 + 警告: 相互の参加アップデートなしにこれを送信すると、予期しない問題が発生する可能性があります。\n\nあなたの参加サブスクリプションを検証するために、連絡先の詳細に移動します。 + 暗号化設定 + 強制的にエンドツーエンド暗号化を使用する + 常に暗号化されたメッセージを送信します (会議を除く) + 暗号化されたメッセージを保存しない + 警告: これはメッセージの損失につながる可能性があります + 上級者オプション + ご利用は注意してください + Conversations について + ビルドおよびライセンス情報 + 消音時間 + 開始時間 + 終了時間 + 消音時間を有効にする + 消音時間の間、通知は無音になります + フォントサイズを拡大 + アプリ全体にわたって大きなフォントサイズを使用します + 送信ボタンにステータスを示す + 要求メッセージの受信 + サポートされている場合、受信したメッセージに緑色のチェックマークが付きます + 送信ボタンに連絡先ステータスを示す色が付きます + その他 + 会議名 + 会議を識別するために JID の代わりにルームのテーマを使用します + OTR フィンガープリントをクリップボードにコピーしました! + あなたはこの会議から禁止されています + この会議はメンバーのみです + あなたはこの会議からキックされました + アカウント %s を使用 + HTTP ホストの画像を確認中 + 画像ファイルは削除されました + 接続されていません。後でもう一度お試しください + 画像ファイルのサイズを確認 + メッセージオプション + テキストをコピー + 元の URL をコピー + 再送 + 画像 URL + メッセージテキスト + URL をクリップボードにコピーしました + メッセージをクリップボードにコピーしました + 画像の転送に失敗しました + QR コードをスキャン + QR コードを表示 + ブロックリストを表示 + アカウントの詳細 + OTR を検証 + リモート フィンガープリント + スキャン + (または電話をタッチ) + ソーシャリスト ミリオネア プロトコル + ヒントまたは質問 + 共有の秘密 + 確認 + 実行中 + 応答 + 失敗しました + 秘密が一致しません + 再度実行してください + 完了 + 検証しました! + 連絡先が SMP 検証を要求しました + 有効な OTR セッションが見つかりません! + Conversations + サービスをフォアグラウンドに保持 + オペレーティングシステムが接続を切断するのを防止します + ファイルの選択 + %1$s 受信中 (%2$d%% 完了) + %s のダウンロード + ファイル + %s を開く + 送信中 (%1$d%% 完了) + 転送用ファイルの準備中 + %s ダウンロード依頼中 + 転送をキャンセル + ファイル転送に失敗しました + ファイルを削除しました + ファイルを開くアプリケーションが見つかりません + フィンガープリントを検証できません + 手動で検証 + 連絡先の OTR フィンガープリントを検証してもよろしいですか? + ダイナミック タグを表示 + 連絡先の下に、読み取り専用タグを表示します + 通知を有効にする + …と会議を作成 + 会議サーバーが見つかりません + 会議の作成に失敗しました! + 会議を作成しました! + 秘密を受取ました! + リセット + アカウント アバター + OTR フィンガープリントをクリップボードにコピーしました + サーバーから履歴を取得中 + サーバーにこれ以上履歴はありません + アップデート中… + パスワードを変更しました! + パスワードを変更できません + メッセージを送信して、暗号化されたチャットを開始します + 質問をたずねる + あなたと連絡先が、(内輪の冗談や、最後に会って食べた昼食などの) 他の誰も知らない共通の秘密を持っている場合、お互いのフィンガープリントを検証するために、その秘密を使用することができます。\n\nあなたはヒントまたは質問を提供して、連絡先は大文字と小文字を区別した答えで応答します。 + 連絡先は共有の秘密であなたにチャレンジして、あなたのフィンガープリントを検証したいと思います。連絡先は秘密に対して、次のヒントまたは質問を提供しました。 + あなたのヒントは空にできません。 + あなたの共有の秘密は空にできません。 + 慎重に、連絡先のフィンガープリントと、以下に表示されるフィンガープリントを比較してください。\nこれを交換するためには、暗号化されたメールや、電話のような信頼できる形式の通信を使用することができます。 + パスワードの変更 + 現在のパスワード + 新しいパスワード + パスワードは空にできません + すべてのアカウントを有効にする + すべてのアカウントを無効にする + アクションを実行... + 所属なし + 役割なし + 追放 + メンバー + 詳細モード + メンバーシップを付与 + メンバーシップを取消 + 管理者権限を付与 + 管理者権限を取消 + 会議から削除 + %s の所属を変更できません + 会議から禁止 + 公開の会議から %s を削除しようとしています。そのための唯一の方法は、永久にそのユーザーを禁止することです。 + 今すぐ禁止 + %s の役割を変更できません + 公開アクセス可能な会議 + プライベート、メンバーのみの会議 + 会議オプション + プライベート (メンバーのみ) + 匿名でない + 会議オプションを変更しました! + 会議オプションを変更できません + なし + 30 分 + 1 時間 + 2 時間 + 8 時間 + 通知があるまで + 入力オプション + Enter は送信 + Enter キーをメッセージの送信に使用します + Enter キーを表示 + 絵文字キーを Enter キーに変更 + オーディオ + ビデオ + 画像 + PDF 文書 + Android アプリ + 連絡先 + %s を受信しました + フォアグラウンド サービスを無効にする + タッチして Conversations を開く + アバターを公開しました! + %s の送信中 + %s の依頼中 + オフラインを非表示にする + アカウントを無効にする + %s は入力中... + %s は入力を停止しました + 入力中通知 + あなたが新しいメッセージを書いている時に、連絡先に知らせます + 位置を送信 + 位置を表示 + 位置を表示するアプリケーションが見つかりません + 位置 + 位置を受信しました + + %d 連絡先を選択 + + diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index bca8d3d2..cb45b4aa 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -422,4 +422,9 @@ %s prestal písať Upozornenia pri písaní Upozorniť kontakt, keď píšete novú správu + Poslať polohu + Zobraziť polohu + Nenašla sa aplikácia na zobrazenie polohy + Poloha + Prijatá poloha diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml index 479889b7..052463c8 100644 --- a/src/main/res/values-sr/strings.xml +++ b/src/main/res/values-sr/strings.xml @@ -302,8 +302,8 @@ УРЛ је копиран на клипборд Порука је копирана на клипборд Пренос слике није успео - Очитај бар-код - Прикажи бар-код + Очитај бар-кôд + Прикажи бар-кôд Прикажи списак блокираних Детаљи налога Овери ОТР @@ -427,4 +427,9 @@ Нема апликације за приказ локације Локација Примљена локација + + Изабери %d контакт + Изабери %d контакта + Изабери %d контаката + diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index 69a66808..874de244 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -36,10 +36,10 @@ Deltagare Besökare Vill du ta bort %s från din kontaktlista? Konversationer associerade med denna kontakt kommer inte tas bort. - Vill du blockera %s från att skicka dig meddelanden + Vill du blockera %s från att skicka dig meddelanden? Vill du avblockera %s och tillåta denne att skicka dig meddelanden? - Blockera alla kontakter från %s - Avblockera alla kontakter från %s + Blockera alla kontakter från %s? + Avblockera alla kontakter från %s? Kontakt blockerad Vill du ta bort %s som bokmärke? Konversationer associerade med detta bokmärke kommer inte tas bort. Registrera nytt konto på servern @@ -74,7 +74,7 @@ Rensa konversationshistorik Vill du ta bort alla meddelanden i denna konversation?\n\nVarning: Detta kommer inte påverka meddelanden lagrade på andra enheter eller servrar. Ta bort meddelanden - Avsluta denna konversation efter + Avsluta sedan denna konversation Välj tillgänglighet till kontakt Skicka meddelande i klartext Skicka OTR-krypterat meddelande @@ -82,9 +82,9 @@ Ditt nick har ändrats Ladda ner bild Skicka okrypterat - Avkryptering gick fel. Du kanske inte har rätt privat nyckel. + Avkryptering misslyckades. Du har kanske kanske inte rätt privat nyckel. OpenKeychain - Conversations använder en tredjeparts applikation som heter OpenKeychain för att kryptera och avkryptera meddelanden och hantera dina publika nycklar.\n\nOpenKeychain är licensierat under GPLv3 och tillgängligt på F-Droid och Google Play.\n\n(Starta om Conversations efter.) + Conversations använder en tredjeparts-applikation som heter OpenKeychain för att kryptera och avkryptera meddelanden och hantera dina publika nycklar.\n\nOpenKeychain är licensierad under GPLv3 och tillgänglig på F-Droid och Google Play.\n\n(Starta om Conversations efter installation.) Starta om Installera erbjuder… @@ -229,7 +229,7 @@ Lämna Kontakten lade till dig i sin kontaktlista Addera tillbaka - %s har läst fram hit + %s har läst hit Publicera Tryck på avatarbild för att välja en bild från bildgalleriet Notera: Alla som kan se dina tillgänglighetsuppdateringar kommer se denna bild. -- cgit v1.2.3 From b7b87e1a8d3c17f49eb9f9d5434224d38afabb24 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Wed, 1 Apr 2015 23:45:46 +0200 Subject: do not overlap account title and switch --- src/main/res/layout/account_row.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/main/res') diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml index 1cd29d59..94c59111 100644 --- a/src/main/res/layout/account_row.xml +++ b/src/main/res/layout/account_row.xml @@ -20,7 +20,10 @@ android:layout_centerVertical="true" android:layout_toRightOf="@+id/account_image" android:orientation="vertical" - android:paddingLeft="8dp" > + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:layout_toLeftOf="@+id/tgl_account_status" + android:layout_toStartOf="@+id/tgl_account_status"> Date: Fri, 3 Apr 2015 00:06:37 +0200 Subject: Enable end-conversation by swipe gesture Add EnhancedListView library de.timroes.android:EnhancedListView:0.3.4 to enable swipe-out for ListViews Re-enable selectableItemBackground Dont end selectedConversation on swipe Call mConversationFragment.reinit() instead. Add separate undo string for swipe MUC. Add blacklistedConversation for undo swipe Update title_undo_swipe_* strings Fix undo(), rename blacklistedConversation Fix discardUndo(); re-init selectedConversation maintain scroll position after undo clear notification when dismissing a conversation modified / simplified maintain scroll position code simplify handling of selectedConversation change undo_muc string, remove notifyDataSetChanged() --- .../fragment_conversations_overview.xml | 2 +- src/main/res/layout/conversation_list_row.xml | 138 ++++++++++++--------- .../res/layout/fragment_conversations_overview.xml | 2 +- src/main/res/values-de/strings.xml | 2 + src/main/res/values-v21/dimens.xml | 4 + src/main/res/values/strings.xml | 3 + 6 files changed, 89 insertions(+), 62 deletions(-) create mode 100644 src/main/res/values-v21/dimens.xml (limited to 'src/main/res') diff --git a/src/main/res/layout-w960dp/fragment_conversations_overview.xml b/src/main/res/layout-w960dp/fragment_conversations_overview.xml index 2744f38e..50039c03 100644 --- a/src/main/res/layout-w960dp/fragment_conversations_overview.xml +++ b/src/main/res/layout-w960dp/fragment_conversations_overview.xml @@ -12,7 +12,7 @@ android:background="@color/primarybackground" android:orientation="vertical" > - + - + - + - + - + - + - - + - - + - \ No newline at end of file + + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml index 69570028..24c653ae 100644 --- a/src/main/res/layout/fragment_conversations_overview.xml +++ b/src/main/res/layout/fragment_conversations_overview.xml @@ -10,7 +10,7 @@ android:background="@color/primarybackground" android:orientation="vertical" > - Keine App für die Standort-Anzeige gefunden Standort Standort empfangen + Unterhaltung beendet + Konferenz verlassen %d Kontakt ausgewählt %d Kontakte ausgewählt diff --git a/src/main/res/values-v21/dimens.xml b/src/main/res/values-v21/dimens.xml new file mode 100644 index 00000000..8bc8f3f7 --- /dev/null +++ b/src/main/res/values-v21/dimens.xml @@ -0,0 +1,4 @@ + + + 63dp + \ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index af56c014..50e9d9e4 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -296,6 +296,7 @@ \n\nhttps://developer.android.com/tools/support-library\n(Apache License, Version 2.0) \n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0) \n\nhttps://github.com/google/material-design-icons\n(CC BY 4.0) + \n\nhttps://github.com/timroes/EnhancedListView\n(Apache License, Version 2.0) Quiet Hours Start time @@ -454,6 +455,8 @@ No application found to display location Location Received location + Conversation closed + Left conference Select %d contact Select %d contacts -- cgit v1.2.3 From 878066ca99c1170479fb217d68ecdb9cf5498975 Mon Sep 17 00:00:00 2001 From: BrianBlade Date: Thu, 2 Apr 2015 13:35:42 +0200 Subject: Add option to use MTM without default TrustManager Add a new "Don't trust system CAs" preference under advanced options that will change the behaviour of the MemorizingTrustManager. All formerly unknown certificates will raise a warning if checked. --- src/main/res/values-de/strings.xml | 2 ++ src/main/res/values/strings.xml | 2 ++ src/main/res/xml/preferences.xml | 5 +++++ 3 files changed, 9 insertions(+) (limited to 'src/main/res') diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 0dd9f401..d5533061 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -427,6 +427,8 @@ Keine App für die Standort-Anzeige gefunden Standort Standort empfangen + Misstraue Zertifizierungsstellen + Alle Zertifikate müssen manuell bestätigt werden %d Kontakt ausgewählt %d Kontakte ausgewählt diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index af56c014..28bb71e9 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -454,6 +454,8 @@ No application found to display location Location Received location + Don\'t trust system CAs + All certificates must be manually approved Select %d contact Select %d contacts diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 8bf6eb87..d48124a6 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -147,6 +147,11 @@ android:key="keep_foreground_service" android:title="@string/pref_keep_foreground_service" android:summary="@string/pref_keep_foreground_service_summary" /> + -- cgit v1.2.3 From 845b39cdcc4d20d916bdee5b661c31a19f6cbdac Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Mon, 13 Apr 2015 15:59:18 +0200 Subject: fixed regression where the selected conversation wasn't highlighted anymore on tabled layout --- src/main/res/layout/conversation_list_row.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/res') diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index de04780f..69abb225 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -6,7 +6,7 @@ + android:background="@color/primary"/> Date: Tue, 14 Apr 2015 15:53:50 +0200 Subject: maintain state when rotating settings activity --- src/main/res/xml/preferences.xml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/main/res') diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index d48124a6..9cf0100f 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -36,7 +36,9 @@ android:title="@string/pref_chat_states" /> - + + android:title="@string/title_pref_quiet_hours" + android:key="quiet_hours"> - + + android:title="@string/pref_expert_options" + android:key="expert"> Date: Sun, 19 Apr 2015 18:08:13 +0200 Subject: Add option to remove manually approved certificates - "Remove certificates" option brings up a dialog that allows to delete certificates from MemorizingTrustManager's keystore - Reconnect active accounts when certificate-settings are changed - new preference category "Certificate options" --- src/main/res/values-de/strings.xml | 11 +++++++++++ src/main/res/values/strings.xml | 11 +++++++++++ src/main/res/xml/preferences.xml | 16 +++++++++++----- 3 files changed, 33 insertions(+), 5 deletions(-) (limited to 'src/main/res') diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index addc55de..d5f550a3 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -429,8 +429,19 @@ Standort empfangen Unterhaltung beendet Konferenz verlassen + Zertifikats-Optionen Misstraue Zertifizierungsstellen Alle Zertifikate müssen manuell bestätigt werden + Zertifikate löschen + Als vertrauenswürdig bestätigte Zertifikate löschen + Keine manuell bestätigten Zertifikate + Zertifikate löschen + Auswahl löschen + Abbrechen + + %d Zertifikat gelöscht + %d Zertifikate gelöscht + %d Kontakt ausgewählt %d Kontakte ausgewählt diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 4a36163c..cc7727d2 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -457,8 +457,19 @@ Received location Conversation closed Left conference + Certificate options Don’t trust system CAs All certificates must be manually approved + Remove certificates + Delete manually approved certificates + No manually approved certificates + Remove certificates + Delete selection + Cancel + + %d certificate deleted + %d certificates deleted + Select %d contact Select %d contacts diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 9cf0100f..417e60a4 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -142,6 +142,17 @@ android:title="@string/pref_display_enter_key" android:summary="@string/pref_display_enter_key_summary" /> + + + + - -- cgit v1.2.3 From e7972d3d112065f37b1b4d99584ecc8f1ca8fd32 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 20 Apr 2015 20:32:50 +0200 Subject: pulled latest translations from transifex --- src/main/res/values-cs/strings.xml | 4 + src/main/res/values-el/strings.xml | 10 +- src/main/res/values-id/strings.xml | 343 +++++++++++++++++++++++++++++++++++++ src/main/res/values-nl/strings.xml | 4 + src/main/res/values-pl/strings.xml | 333 ++++++++++++++++++++++++++++++++++- src/main/res/values-ru/strings.xml | 36 +++- 6 files changed, 727 insertions(+), 3 deletions(-) create mode 100644 src/main/res/values-id/strings.xml (limited to 'src/main/res') diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 0c08fa7a..192df52f 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -427,6 +427,10 @@ Nebyla nalezena aplikace pro zobrazení pozice Pozice Přijmout pozici + Conversation zavřena + Opustil(a) konferenci + Nedůvěřovat systémovým CA + Všechny certifikáty musí být schváleny ručně Vybrat %d kontakt Vybrat %d kontakty diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index 48dc4034..ec1da08c 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -359,7 +359,7 @@ Δεν ήταν δυνατή η αλλαγή του συνθηματικού Αποστολή μηνύματος για την έναρξη κρυπτογραφημένης συνομιλίας Ερώτηση - Αν εσείς και η επαφή σας έχετε ένα κοινό μυστικό που κανείς άλλος δεν γνωρίζει (κάτι σαν δικό σας αστείο ή απλώς τι φάγατε την τελευταία φορά που συναντηθήκατε) μπορείτε να χρησιμοποιήσετε αυτό το μυστικό για νε επαληθεύσετε τα αποτυπώματά σας.\n\nΠροσφέρετε έναν υπαινιγμό ή μια ερώτηση για την επαφή σας, που θα απαντήσει με μια φράση στην οποία έχουν διαφοροποίηση τα πεζά από τα κεφαλαία. + Αν εσείς και η επαφή σας έχετε ένα κοινό μυστικό που κανείς άλλος δεν γνωρίζει (κάτι σαν δικό σας αστείο ή απλώς τι φάγατε την τελευταία φορά που συναντηθήκατε) μπορείτε να χρησιμοποιήσετε αυτό το μυστικό για να επαληθεύσετε τα αποτυπώματά σας.\n\nΠροσφέρετε έναν υπαινιγμό ή μια ερώτηση για την επαφή σας, που θα απαντήσει με μια φράση στην οποία έχουν διαφοροποίηση τα πεζά από τα κεφαλαία. Η επαφή σας θα ήθελε να επαληθεύσει το αποτύπωμά σας χρησιμοποιώντας ένα κοινό μυστικό. Η επαφή σας προμήθευση τον παρακάτω υπαινιγμό ή ερώτηση για το μυστικό αυτό. Ο υπαινιγμός σας δεν μπορεί να είναι κενός Το κοινό μυστικό σας δεν μπορεί να είναι κενό @@ -427,4 +427,12 @@ Δεν βρέθηκε εφαρμογή για την απεικόνιση τοποθεσίας Τοποθεσία Ελήφθη τοποθεσία + Η συζήτηση έκλεισε + Έφυγε από την συνδιάσκεψη + Μη έμπιστες αρχές πιστοποίησης συστήματος + Όλα τα πιστοποιητικά πρέπει να εγκριθούν χειροκίνητα + + Επιλογή %d επαφής + Επιλογή %d επαφών + diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml new file mode 100644 index 00000000..6c2dedb6 --- /dev/null +++ b/src/main/res/values-id/strings.xml @@ -0,0 +1,343 @@ + + + Pengaturan + Percakapan Baru + Pengaturan Akun + Akhiri Percakapan + Detil Kontak + Detil conference + Amankan Percakapan + Tambah Akun + Ubah Nama + Tambah ke buku telepon + Hapus dari roster + Blokir kontak + Batal blokir kontak + Blokir domain + Batal blokir domain + Pengaturan Akun + Pengaturan + Conference Detil + Kontak Detil + Bagikan dengan Conversation + Mulai Percakapan + Pilih kontak + Daftar blokir + sekarang + 1 min lalu + %d min lalu + Percakapan belum dibaca + mengirim... + Menerjemahkan pesan. Tunggu sebentar... + Nick ini sudah digunakan + Administrator + Pemilik + Moderator + Peserta + Pengunjung + Apakah Anda ingin menghapus %s dari roster Anda? Percakapan yang terkait dengan kontak ini tidak akan dihapus. + Apakah Anda ingin memblokir pesan dari %s? + Apakah Anda ingin membuka blokir %s dan membolehkannya untuk mengirim pesan? + Blokir semua kontak dari %s? + Batalkan blokir semua kontak dari %s? + Kontak terblokir + Apakah Anda ingin menghapus %s dari bookmark? Percakapan yang terkait dengan bookmark ini tidak akan dihapus. + Daftarkan akun baru di server + Ganti password di server + Bagikan dengan... + Mulai Percakapan + Undang Kontak + Kontak + Batal + Atur + Tambah + Ubah + Hapus + Blokir + Batalkan blokir + Simpan + YA + Percakapan terhenti + Dengan mengirimkan laporan kesalahan Anda membantu pengembangan Conversations\n<b>Perhatian:</>Conversations akan menggunakan akun XMPP Anda untuk mengirim laporan kesalahan untuk pengembang. + Kirim sekarang + Jangan tanya lagi + Tidak terhubung ke akun + Tidak bisa terhubung ke banyak akun + Sentuh untuk mengatur akun + Sisipkan berkas + Kontak tidak ada dalam roster Anda. Ingin menambahkannya? + Tambah kontak + pengiriman gagal + ditolak + Mempersiapkan gambar untuk transmisi + Bersihkan riwayat + Hapus Riwayat Percakapan + Apakah Anda ingin menghapus semua pesan dalam Percakapan ini\n\nPeringatan:ini tidak akan mempengaruhi pesan yang disimpan pada perangkat atau server lain. + Hapus pesan + Pilih kehadiran untuk kontak + Kirim pesan teks biasa + Kirim pesan terenskripsi OTR + Kirim pesan terenskripsi OpenPGP + Nick kamu telah dirubah + Unduh Gambar + Kirim tidak terenkripsi + Dekripsi gagal. Mungkin Anda tidak memiliki kunci pribadi yang tepat. + OpenKeychain + Mulai ulang + Pasang + menawarkan... + menunggu... + Tidak ada kunci OpenPGP ditemukan + Tidak ada kunci OpenPGP ditemukan + Percakapan tidak dapat mengenkripsi pesan Anda karena kontak tidak mengumumkan kunci publik mereka.\n\nSilakan meminta kontak Anda untuk setup OpenPGP. + Pesan terenkripsi diterima. Sentuh untuk membongkar dan melihatnya. + Umum + XMPP resource + Identifikasi nama klien ini dengan + Terima berkas + Otomatis menerima berkas lebih kecil dari... + Pengaturan Notifikasi + Notifikasi + Notifikasikan jika pesan baru tiba + Getar + Juga aktifkan getaran bila pesan baru tiba + Suara + mainkan suara saat menerima notifikasi + Notifikasi Conference + Selalu memberitahukan bila pesan conference baru diterima daripada hanya dicetak tebal + Tenggang waktu pemberitahuan + Nonaktifkan pemberitahuan untuk waktu yang singkat setelah salinan diterima + Opsi Lanjutan + Jangan kirim laporan kerusakan + Dengan mengirimkan kesalahan Anda membantu pengembangan Aplikasi Conversations + Konfirmasi Pesan + Biarkan kontak Anda tahu kapan Anda telah menerima dan membaca pesan + Opsi Tampilan + OpenKeychain melaporkan kesalahan + I/O Error menerjemahkan berkas + Menerima + Sebuah kesalahan terjadi + Memberikan perubahan kehadiran + Terlebih dahulu meminta dan berlangganan kehadiran untuk kontak Anda buat + Langganan + Akun anda + Kunci + Kirim pembaruan kehadiran + Terima pembaruan kehadiran + Tanya untuk pembaruan kehadiran + Pilih gambar + Ambil gambar + Ijinkan permintaan berlangganan + Berkas yang anda pilih bukan gambar + Terjadi kesalahan saat mengubah berkas gambar + Berkas tidak ditemukan + Kesalahan Umum I/O. Mungkin Anda kehabisan ruang penyimpanan? + Aplikasi yang digunakan untuk memilih gambar tidak memberikan izin untuk membaca file.\n\n Gunakan file manager yang berbeda untuk memilih gambar + Tidak diketahui + Sementara dimatikan + Online + Menghubungkan\u2026 + Offline + Tidak mendapat izin + Server tidak ditemukan + Tidak ada koneksi + Registrasi gagal + Username telah digunakan + Registrasi berhasil + Server tidak mendukung pendaftaran akun. + Kesalahan keamanan + Server tidak cocok + Teks biasa + OTR + OpenPGP + Ubah akun + Hapus akun + Sementara dimatikan + Publikasikan avatar + terlihat %d hari lalu + tidak pernah terlihat + Penerimaan gagal + Fingerprint Anda + OTR fingerprint + Verifikasi + Deskripsi + Conferences + Cari + Buat Kontak + Gabung Conference + Hapus Kontak + Lihat detil kontak + Blokir kontak + Lepas blokir kontak + Buat + Kontak ini sudah ada + Gabung + Alamat conference + room@conference.example.com + Simpan sebagai bookmark + Hapus bookmark + Anda + Conference tidak ditemukan + Tambah kembali + Kirim pesan pribadi ke %s + Hubungkan + Akun ini sudah ada + Selanjutnya + Informasi tambahan + Lewati + Nonaktifkan notifikasi + Nonaktifkan notifikasi untuk percakapan ini + Notifikasi telah dimatikan + Aktifkan + Conference membutuhkan password + Masukan password + Abaikan + Pengaturan enskripsi + Paksa enskripsi end-to-end + Selalu mengirim pesan terenkripsi (kecuali untuk conferences) + jangan simpan pesan terenskripsi + Peringatan: Hal ini bisa mengakibatkan hilangnya pesan + Pengaturan lanjutan + Harap berhati-hati dengan ini + Tentang Conversations + Build dan informasi lisensi + Waktu sunyi + Waktu mulai + Waktu selesai + Aktifkan waktu sunyi + Perbesar ukuran huruf + Tombol kirim menunjukan statusnya + Lainnya + menggunakan akun %s + Mengecek gambar di host HTTP + Berkas gambar telah dihapus + Anda tidak terhubung. Coba lagi nanti + Cek ukuran berkas gambar + Opsi pesan + Salin teks + Salin URL asli + Kirim lagi + URL gambar + Pesan teks + URL disalin ke clipboard + Pesan disalin ke clipboard + pengiriman gambar gagal + Pindai kode QR + Tampilkan kode QR + Tampilkan daftar blokir + Detil akun + Sedang diproses + Gagal + Coba lagi + Selesai + Terverifikasi! + Percakapan + Jaga layanan di latar depan + Cegah sistem operasi mematikan koneksi + Pilih berkas + Menerima %1$s (%2$d%% terselesaikan) + Mengunduh %s + berkas + Buka %s + mengirim (%1$d%% terselesaikan) + Menyiapkan berkas untuk transmisi + %s ditawarkan untuk mengunduh + batalkan pengiriman + pengiriman berkas gagal + Berkas sudah dihapus + Tidak ditemukan aplikasi untuk membuka berkas + Tidak dapat verifikasi fingerprint + Verifikasi secara manual + Yakin untuk memferifikasi OTR fingerprint kontak Anda? + Tampilkan tag dinamis + Tampilan read-only tag di bawah kontak + Aktifkan notifikasi + Buat conference dengan... + Tidak ada server conference ditemukan + Pembuatan conference gagal! + Conference dibuat! + Rahasia disetujui! + Ulang + Avatar akun + Salin OTR fingerprint ke clipboard + Mengambil data dari server + Tidak ada data lagi di server + Merubah... + Password diganti! + Tidak dapat mengubah password + Kirim pesan untuk memulai obrolan dienkripsi + Bertanya + Petunjuk Anda tidak boleh kosong + Rahasia bersama Anda tidak boleh kosong + Hati-hati membandingkan sidik jari yang ditunjukkan di bawah dengan sidik jari kontak Anda.\nAnda dapat mengunakan layanan komunikasi terpercaya seperti e-mail terenskripsi atau panggilan telepon untuk menukarkannya. + Ubah password + Password sekarang + Password baru + Password tidak boleh kosong + Aktifkan semua akun + Menonaktifkan semua account + Lakukan aksi dengan + Tidak ada afiliasi + Tidak ada peran + Orang buangan + Member + Mode lanjut + Memberikan keanggotaan + Cabut keanggotaan + Memberikan hak istimewa admin + Mencabut hak istimewa admin + Hapus dari conference + Tidak bisa mengubah afiliasi %s + Tendang dari conference + Anda mencoba untuk menghapus %s dari sebuah conference publik. Satu-satunya cara untuk melakukannya adalah untuk menendang pengguna ini selamanya. + Tendang sekarang + Tidak dapat merumah role %s + Conference umum + Rahasia, hanya member conference + Opsi conference + Rahasia (Hanya member) + Non Anonymous + Opsi conference dimodifikasi! + Tidak dapat merubah pengaturan conference + Tidak pernah + 30 menit + 1 jam + 2 jam + 8 jam + Sampai pemberitahuan selanjutnya + Opsi input + Enter untuk mengirim + Gunakan enter untuk mengrim pesan + Tampilkan masukan kunci + Mengubah kunci emoji untuk memasukan kunci + audio + video + Gambar + Berkas PDF + Apl Android + Kontak + Diterima %s + Nonaktifkan layanan latar belakang + Sentuh untuk membuka Conversations + Avatar telah diterbitkan! + Mengirim %s + Menawarkan %s + Sembunyikan Offline + Nonaktifkan Akun + %s sedang mengetik... + %s telah berhenti mengetik + Notifikasi ketik pesan + Biarkan kontak Anda tahu ketika Anda sedang menulis pesan baru + Kirim lokasi + Tampilkan lokasi + Tidak ada aplikasi ditemukan untuk menampilkan lokasi + Lokasi + Lokasi yang diterima + Percakapan tertutup + Tinggalkan conference + Jangan percaya sistem CA + Semua sertifikat harus disetujui secara manual + + Pilih %d kontak + + diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index 2b8c5501..650e18c4 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -427,6 +427,10 @@ Geen applicatie gevonden om locatie weer te geven Locatie Locatie ontvangen + Gesprek gesloten + Groepsgesprek verlaten + Vertrouw geen systeem-CA\'s. + Alle certificaten moeten handmatig goedgekeurd worden Selecteer %d contact Selecteer %d contacten diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 58dea13b..3c58c485 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -5,8 +5,11 @@ Zarządzaj kontami Zakończ konwersację Szczegóły kontaktu - Szczególy konferencji + Szczegóły konferencji + Konwersacja szyfrowana Dodaj konto + Edytuj nazwę + Dodaj do książki telefonicznej Usuń z rostera Zablokuj kontakt Odblokuj kontakt @@ -16,6 +19,7 @@ Ustawienia Szczegóły konferencji Szczegóły kontaktu + Udostępnij przez Conversation Rozpocznij konwersację Wybierz kontakt Czarna lista @@ -25,6 +29,7 @@ nieprzeczytanych konwersacji wysyłanie... Deszyfrowanie wiadomości. Proszę czekać... + Nazwa jest już w użyciu Admin Właściciel Moderator @@ -36,12 +41,15 @@ Zablokować wszystkie kontakty z %s? Odblokować wszystkie kontakty z %s? Kontakt zablokowany + Czy usunąć zakładkę %s? Konwersacja powiązana z zakładką nie zostanie usunięta. Zarejestruj nowe konto na serwerze Zmień hasło na serwerze + Udostępnij... Rozpocznij konwersację Zaproś kontakt Kontakty Anuluj + Ustaw Dodaj Edytuj Usuń @@ -50,6 +58,7 @@ Zapisz Ok Conversations uległo awarii + Wysyłając ślady stosu pomagasz rozwijać Conversations\nUwaga: Ślad stosu zostanie przesłany deweloperowi przy użyciu twojego konta XMPP. Wyślij teraz Nie pytaj ponownie Nie można połączyć się z kontem @@ -60,30 +69,352 @@ Dodaj kontakt wysyłanie nie powiodło się odrzucono + Przygotowywanie obrazu do wysłania Wyczyść historię Wyczyść historię konwersacji + Czy na pewno usunąć wszystkie wiadomości powiązane z konwersacją?\n\nUwaga: Działanie nie wpływa na wiadomości przechowywane na innych urządzeniach lub serwerach. Usuń wiadomości + Zakończ konwersację po usunięciu historii + Wybierz widoczność dla kontaktu + Wyślij wiadomość jawną + Wyślij zaszyfrowaną wiadomość (OTR) + Wyślij zaszyfrowaną wiadomość (OpenPGP) + Twoja nazwa została zmieniona + Pobierz obraz + Wyślij bez szyfrowania + Nie można odszyfrować. Sprawdź poprawność klucza prywatnego. + OpenKeychain + Conversations używa zewnętrznej aplikacji OpenKeychain do szyfrowania wiadomości i zarządzania kluczami publicznymi.\n\nOpenKeychain rozpowszechniany jest na licencji GPLv3 przez F-Droid lub Google Play.\n\n(Zrestartuj Conversations po instalacji). + Zrestartuj + Zainstaluj + oferowanie... + oczekiwanie... + Nie znaleziono klucza OpenPGP + Conversations nie może zaszyfrować wiadomości, ponieważ kontakt nie udostępnia klucza publicznego.\n\nZasugeruj rozmówcy instalację OpenPGP. + Nie znaleziono kluczy OpenPGP + Conversations nie może zaszyfrować wiadomości, ponieważ kontakty nie udostępniają kluczy publicznych.\n\nZasugeruj rozmówcom instalację OpenPGP. + Otrzymano zaszyfrowaną wiadomość. Dotknij, aby odszyfrować i wyświetlić. + Główne + Zasób XMPP + Nazwa identyfikująca urządzenie + Akceptuj pliki + Automatycznie akceptuj pliki mniejsze niż... + Ustawienia powiadamiania + Powiadomienia + Powiadamiaj, gdy nadejdzie wiadomość + Wibracje + Wibruj, gdy nadejdzie wiadomość + Dźwięk + Odtwórz dźwięk z powiadomieniem + Powiadomienia konferencji + Zawsze powiadamiaj o nowej wiadomości w konferencji + Opóźnienie powiadomień + Wyłącz powiadomienia przez krótki czas po otrzymaniu kopii wiadomości + Opcje zaawansowane + Nie wysyłaj raportów awarii + Wysyłając ślady stosu pomagasz rozwijać Conversations + Potwierdzenia wiadomości + Powiadamiaj kontakty o otrzymaniu lub przeczytaniu wiadomości + Ustawienia interfejsu + Wystąpił błąd OpenKeychain + Błąd podczas deszyfrowania pliku + Akceptuj + Wystąpił błąd + Zezwól na powiadomienia obecności + Automatycznie zezwalaj i pytaj o powiadomienia obecności, kiedy utworzysz kontakt + Subskrypcje + Twoje konto + Klucze + Wysyłaj powiadomienia obecności + Otrzymuj powiadomienia obecności + Poproś o powiadomienia obecności + Wybierz obraz + Zrób zdjęcie + Automatyczne powiadomienia obecności + Wybrany plik nie jest obrazem + Błąd kompresji obrazu + Nie odnaleziono pliku + Ogólny błąd wejścia/wyjścia + Aplikacja użyta do wyboru obrazu nie zezwoliła na odczyt pliku.\n\nWybierz obraz przy użyciu innego menedżera plików + nieznany + Tymczasowo wyłączono + Połączono + Łączenie... + Rozłączono + Błąd uwierzytelnienia + Nie odnaleziono serwera + Brak połączenia + Błąd rejestracji + Nazwa jest już w użyciu + Zarejestrowano pomyślnie + Serwer nie umożliwia rejestracji + Błąd zabezpieczeń + Serwer niekompatybilny + Tekst jawny + OTR + OpenPGP + Edytuj konto + Usuń konto + Wyłącz tymczasowo + Publikuj awatar + Udostępnij klucz publiczny OpenPGP + Włącz konto + Czy na pewno? + Wraz z kontem zostanie nieodwracalnie usunięta powiązana historia konwersacji. + Nagraj głos + Jabber ID + Hasło + username@example.com + Potwierdź hasło + Hasło + Potwierdź hasło + Hasła są niezgodne + Wprowadzono niepoprawny Jabber ID + Brak pamięci, obraz jest za duży + Czy chcesz dodać kontakt %s do książki telefonicznej? + dostępny + chętny do rozmowy + zaraz wracam + będę później + nie przeszkadzać + niedostępny + Konferencja + Pozostali uczestnicy + Informacje o serwerze + XEP-0313: MAM + XEP-0280: Kopie wiadomości + dostępny + niedostępny + Brak informacji o kluczu publicznym + widziany chwilę temu + widziany minutę temu + widziany %d minut(y) temu + widziany godzinę temu + widziany %d godzin(y) temu + widziany wczoraj + widziany %d dni temu + nigdy nie widziany + Wiadomość zaszyfrowana. Zainstaluj OpenKeychain, żeby odszyfrować. + Nieznany odcisk klucza OTR + Znaleziono wiadomości zaszyfrowane przez OpenPGP + Twój odcisk klucza + Odcisk klucza OTR + Weryfikuj + Odszyfruj + Konferencje + Szukaj + Utwórz kontakt + Dołącz do konferencji + Usuń kontakt + Szczegóły kontaktu + Zablokuj kontakt + Odblokuj kontakt + Utwórz + Kontakt już istnieje + Dołącz + Adres konferencji + room@conference.example.com + Dodaj jako zakładkę + Usuń zakładkę + Zakładka już istnieje + Ty + Edytuj temat konferencji + Nie znaleziono konferencji + Opuść pokój + Kontakt został dodany do listy + Dodaj ponownie + %s przeczytał do tego miejsca + Publikuj + Naciśnij awatar, żeby wybrać obraz z galerii + Uwaga: Obraz będzie widoczny dla wszystkich kontaktów, którym udostępniasz powiadomienia o obecności. + Publikowanie... + Serwer odrzucił żądanie publikacji + Wystąpił błąd podczas konwersji obrazu + Nie udało się zapisać obrazu w pamięci urządzenia + Serwer nie udostępnia możliwości publikacji awatarów + do %s + Wyślij prywatną wiadomość do %s + Połącz + Konto już istnieje + Dalej + Połączono + Dodatkowe informacje + Pomiń + Wyłącz powiadomienia + Wyłącz powiadomienia tej konwersacji + Powiadomienia są wyłączone + Włącz + Konferencja jest zabezpieczona hasłem + Wprowadź hasło + Kontakt nie udostępnia powiadomień o obecności + Zażądaj teraz + Usuń odcisk klucza + Czy na pewno chcesz usunąć odcisk klucza? + Ignoruj + Ustawienia szyfrowania + Wymuszaj szyfrowanie typu end-to-end + Szyfruj wszystkie wiadomości (poza konferencjami) + Nie zapisuj zaszyfrowanych wiadomości + Uwaga: Może powodować utratę wiadomości + Ustawienia zaawansowane + Modyfikuj ustawienia ostrożnie + O Conversations + Informacje o kompilacji i licencji + Godziny ciszy + Początek + Koniec + Włącz godziny ciszy + Powiadomienia będą wyciszone w wybranym przedziale czasu + Większy rozmiar czcionki + Używaj większego rozmiaru czcionki w aplikacji + Przycisk wysyłania wskazuje status + Raporty dostarczenia + Jeżeli to możliwe, oznaczaj dostarczone wiadomości zielonym haczykiem + Koloruj przycisk wysyłania w zależności od statusu kontaktu + Inne opcje + Nazwa konferencji + Nazywaj konferencję tematem zamiast Jabber ID + Odcisk klucza OTR został skopiowany do schowka + Zbanowano cię w konferencji + To jest zamknięty pokój + Wyrzucono cię z konferencji + Sprawdzanie obrazka na hoście HTTP + Obraz został usunięty + Brak połączenia. Spróbuj ponownie później + Sprawdź rozmiar pliku + Opcje wiadomości + Skopiuj tekst + Skopiuj oryginalny URL + Wyślij ponownie + URL obrazu + Treść wiadomości + URL obrazu został skopiowany do schowka + Wiadomość została skopiowana do schowka + Błąd podczas przesyłania obrazu + Zeskanuj kod QR + Pokaż kod QR + Wyświetl listę banów + Szczegóły konta + Weryfikuj OTR + Zdalny odcisk klucza + (lub zetknij telefony) + Protokół socialist millionaire + Podpowiedź lub pytanie + Wspólny sekret + Potwierdź + W toku + Odpowiedz + Sekrety są niezgodne + Spróbuj ponownie + Zakończ + Weryfikacja udana! + Kontakt zażądał weryfikacji SMP + Brak ważnej sesji OTR! + Conversations + Usługa na pierwszym planie + Uniemożliwia systemowi przerwanie połączenia + Wybierz plik + Odbieranie %1$s (ukończono %2$d%%) + Pobierz %s + plik + Otwórz %s + Wysyłanie (ukończono %1$d%%) + Przygotowywanie pliku do wysłania + Zaproponowano pobranie pliku %s + Anuluj przesyłanie + Przesyłanie pliku nie powiodło się + Plik został usunięty + Nie odnaleziono aplikacji skojarzonej z typem pliku + Weryfikacja odcisku klucza nieudana + Weryfikuj ręcznie + Czy na pewno chcesz zweryfikować odcisk klucza OTR kontaktu? + Etykiety kontaktów + Wyświetlaj etykiety pod kontaktami + Włącz powiadomienia + Utwórz konferencję... + Nie odnaleziono serwera konferencji + Nie udało się utworzyć konferencji! + Konferencja została utworzona! + Sekret został zaakceptowany! + Resetuj + Awatar konta + Skopiuj odcisk klucza OTR do schowka + Pobieranie historii z serwera + Koniec historii na serwerze + Aktualizowanie... + Hasło zostało zmienione! + Nie udało się zmienić hasła + Wyślij wiadomość, żeby rozpocząć szyfrowaną rozmowę + Zadaj pytanie + Jeśli ty i twój kontakt macie jakiś wspólny sekret, którego nie zna nikt inny (żart znany tylko wam lub po prostu co jedliście ostatnim razem, gdy się widzieliście) możecie użyć tego sekretu by zweryfikować wzajemnie odciski swoich kluczy.\n\nPodasz podpowiedź lub pytanie dla twojego kontaktu i otrzymasz odpowiedź (wielkość liter ma znaczenie). + Twój kontakt chciałby zweryfikować odcisk Twojego klucza poprzez sprawdzenie znajomości wspólnego sekretu. Twój znajomy przedstawił następującą podpowiedź lub pytanie dotyczącego tego sekretu. + Wskazówka nie powinna być pusta + Sekret nie może być pusty + Ostrożnie porównaj odcisk klucza pokazany poniżej z odciskiem klucza twojego kontaktu.\nMożesz użyć bezpiecznego kanału komunikacji takiego, jak szyfrowany e-mail lub rozmowa telefoniczna, by wymienić odciski klucza. Zmień hasło Obecne hasło Nowe hasło Hasło nie może być puste Aktywuj wszystkie konta Wyłącz wszystkie konta + Użyj + Brak stanowiska + Brak funkcji + Wykluczony + Członek + Tryb zaawansowany + Przyznaj członkostwo + Cofnij członkostwo + Przyznaj uprawnienia administratora + Odbierz uprawnienia administratora + Usuń z konferencji + Nie udało się zmienić stanowiska dla %s + Zbanuj uczestnika konferencji + Próbujesz usunąć %s z publicznego pokoju. Jedyny sposób, by to zrobić, to wykluczyć tego użytkownika na zawsze. + Zbanuj teraz + Nie udało się zmienić funkcji %s + Konferencja publiczna + Konferencja prywatna, dla zaakceptowanych uczestników + Opcje konferencji + Prywatna (tylko zaakceptowani) + Opcje konferencji zostały zmienione! + Nie udało się zmienić opcji konferencji Nigdy 30 minut 1 godzina 2 godziny 8 godzin + Ręcznie + Ustawienia wprowadzania + Enter wysyła Używaj klawisza Enter do wysyłania wiadomości Pokaż klawisz Enter Zamień klawisz emotikon na klawisz Enter plik audio plik wideo obraz + Dokument PDF + Aplikacja Androida Kontakt Odebrano %s + Wyłącz podtrzymanie pierszego planu usługi + Dotknij, aby otworzyć Conversations Avatar został pomyślnie opublikowany! Wysyłanie %s Oferowanie %s Ukryj niedostępnych + Wyłącz konto + %s pisze... + %s przestał(a) pisać + Powiadomienia pisania + Powiadamiaj rozmówcę, kiedy rozpoczynasz nową wiadomość + Wyślij lokalizację + Pokaż lokalizację + Nie odnaleziono aplikacji do wyświetlenia lokalizacji + Lokalizacja + Otrzymano lokalizację + Zamknięto konwersację + Opuszczono konferencję + Nie ufaj certyfikatom systemowym + Wymagaj ręcznego potwierdzania certyfikatów diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 4a96a7fe..0f3ec4c7 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -11,6 +11,10 @@ Редактировать контакт Добавить в телефонную книгу Удалить из списка + Заблокировать контакт + Разблокировать контакт + Заблокировать домен + Разблокировать домен Управление Аккаунтами Настройки Сведения о Конференции @@ -18,6 +22,7 @@ Поделиться Начать беседу Выберите собеседника + Черный список только что 1 минуту назад %d мин. назад @@ -31,16 +36,25 @@ Участник Посетитель Вы хотите удалить %s из своего списка? Беседы, связанные с этим аккаунтом будут сохранены. + Вы хотите заблокировать дальнейшие сообщения от %s? + Вы хотите разблокировать пользователя %s? + Заблокировать всех пользователей домена %s? + Разблокировать всех пользователей домена %s? + Контакт заблокирован Вы хотите удалить %s из избранного? Беседы, связанные с данной закладкой будут сохранены Создать новый аккаунт на сервере + Изменить пароль на сервере Поделиться с Начать беседу Пригласить собеседника Контакты Отмена + Установить Добавить Редактировать Удалить + Заблокировать + Разблокировать Сохранить ОК Conversations был неожиданно остановлен @@ -134,6 +148,8 @@ Имя пользователя уже используется Регистрация завершена Сервер не поддерживает регистрацию + Ошибка безопасности + Несовместимый сервер Без шифрования OTR OpenPGP @@ -164,8 +180,13 @@ не в сети Конференция Другие участники + Информация о сервере + XEP-0313: Сохранение сообщений в архив Дублирование сообщений - Управление потоками + XEP-0352: Индикатор Состояния Клиента + XEP-0191: Команда Блокирования + XEP-0237: Управление версиями списков + XEP-0198: Управление потоками XEP-0163: PEP (Аватары) доступен недоступен @@ -192,6 +213,8 @@ Присоединиться к конференции Удалить Контакт Посмотреть данные контакта + Заблокировать контакт + Разблокировать контакт Создать Контакт уже существует Присоединиться @@ -245,8 +268,19 @@ Внимание: Это может привести к потере сообщений Расширенные настройки Пожалуйста, будьте осторожны с данными настройками + О Conversations + Информация о билде и лицензировании + Тихие Часы + Начало + Окончание + Включить режим «тихих часов» + Уведомления будут отключены во время «тихих часов» Увеличить размер шрифта Установите больший размер шрифта по всей программе Использовать кнопку-индикатор + Запрос в получении сообщения + Если поддерживается, поступившие сообщения будут отмечены зеленой галочкой Раскрасить кнопку отправить, указывая текущий статус собеседника + Другие + Название конференции -- cgit v1.2.3 From e9783b80d18c5d1b64090d7e6fa4cf1e6b95f177 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 21 Apr 2015 10:13:28 +0200 Subject: added missing translations from transifex --- src/main/res/values-ar-rEG/strings.xml | 1 - src/main/res/values-bg/strings.xml | 6 +++++- src/main/res/values-ca/strings.xml | 1 - src/main/res/values-es/strings.xml | 6 +++++- src/main/res/values-eu/strings.xml | 3 ++- src/main/res/values-fr/strings.xml | 1 - src/main/res/values-it/strings.xml | 1 - src/main/res/values-ja/strings.xml | 4 ++++ src/main/res/values-sk/strings.xml | 1 - src/main/res/values-sr/strings.xml | 4 ++++ src/main/res/values-sv/strings.xml | 4 ++++ 11 files changed, 24 insertions(+), 8 deletions(-) (limited to 'src/main/res') diff --git a/src/main/res/values-ar-rEG/strings.xml b/src/main/res/values-ar-rEG/strings.xml index 3acf8e54..35eff49f 100644 --- a/src/main/res/values-ar-rEG/strings.xml +++ b/src/main/res/values-ar-rEG/strings.xml @@ -260,7 +260,6 @@ لايمكن تغيير كلمة السر ارسل رساله لبدأ محادثة مشفّرة أسال سؤال - إذا كنت و جهة اتصالك لديكم سر مشترك غير معروف لأحد آخر (مثل جملة مكرره بينكم او تاريخ ما يخصكم كتاريخ آخر لقاء بينكم ) استخدماه للتحقق من بصمات الأصابع \n\n عليك توفير تلميحا أو سؤال لجهة الإتصال بك للحصول على تلك الإجابه وبدأ التواصل سترغب جهة الإتصال بتأكيد بصمتك عبر السر المشترك بينكما لذلك أخبره تلميحا أو إسأله سؤالا يذكره بالسر ليكتبه برده التلميح الذي يراه صديقك لا يمكن ان يكون فارغ السر المشترك بينكما لا يمكن ان يترك فارغا !! diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml index 2f89f3ae..b4810f51 100644 --- a/src/main/res/values-bg/strings.xml +++ b/src/main/res/values-bg/strings.xml @@ -359,7 +359,7 @@ Неуспешна промяна на паролата Изпратете съобщение, за да започнете нешифрован разговор Задаване на въпрос - Ако Вие и контакта Ви имате някаква тайна информация, която никой друг не знае (като някаква шега или пък просто какво сте обядвали, когато сте се срещнали за последно), можете да я използвате, за да проверите отпечатъците си един на друг.\n\nМожете да подсигурите подсказка или въпрос, на който контакта Ви да отговори, като има предвид, че главните и малките букви се броят за различни. + Ако Вие и контактът Ви имате някаква тайна информация, която никой друг не знае (като някаква шега или пък просто какво сте обядвали, когато сте се срещнали за последно), можете да я използвате, за да проверите отпечатъците си един на друг.\n\nМожете да подсигурите подсказка или въпрос, на който контактът Ви да отговори, като има предвид, че главните и малките букви се броят за различни. Вашият контакт би искал да провери отпечатъка Ви, като Ви попита за обща тайна информация. Контактът Ви предостави следната подсказка или въпрос, който да Ви насочи към тази тайна. Подсказката Ви не трябва да е празна Общата Ви тайна не може да е празна @@ -427,6 +427,10 @@ Няма намерено приложение за показване на местоположението Местоположение Получено местоположение + Conversation се затвори + Напуснахте беседата + Да не се вярва на системните сертификати + Всички сертификати трябва да бъдат одобрени на ръка Изберете %d контакт Изберете %d контакта diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index e50fa740..a0861b16 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -359,7 +359,6 @@ No s\'ha pogut canviar la contrasenya Començar a enviar un missatge de conversació xifrat Fer una pregunta - Si vosté i el seu contacte tenen un secret en comú que ningú més sap (com una broma o simplement el que tenia per dinar l\'última vegada que es va trobar) pot utilitzar aquest secret per comprovar les empremtes dactilars de cadascú. \ n\ n Proporcionarás una pista o una pregunta per a la seu contacte que respondrà amb una resposta entre majúscules i minúscules. El seu contacte l\'hi agradaria verificar la seva empremta digital per un repte amb un secret compartit.El seu contacte proporciona el següent suggeriment o pregunta per aquest secret. El seu suggeriment no pot estar buit El teu secret compartit no pot estar buit diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 44d8abb2..d7c6a885 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -359,7 +359,7 @@ No se puede cambiar la contraseña Enviar mensaje para empezar una conversación cifrada Haz una pregunta - Si tu contacto y tú tenéis un secreto en común que nadie más sabe (como un pequeño juego o broma o simplemente lo que tomasteis para comer la última vez os visteis) podéis usar ese secreto para verificar la huella digital de cada uno.\n\nPuedes usar una sugerencia o pregunta para hacer a tu contacto que deberá responder distinguiendo mayúsculas y minúsculas. + Si tu contacto y tú tenéis un secreto en común que nadie más sabe (como una broma o simplemente lo que tomasteis para comer la última vez que os visteis) podéis usar ese secreto para verificar la huella digital de cada uno.\n\nPuedes usar una sugerencia o pregunta para hacer a tu contacto que deberá responder distinguiendo mayúsculas y minúsculas. Tu contacto quiere verificar tu huella digital a través de un secreto compartido. Te hace la siguiente sugerencia o pregunta para ese secreto. La pregunta no puede ser vacía El secreto compartido no puede ser vacío @@ -427,6 +427,10 @@ No se ha encontrado ninguna aplicación para mostrar la ubicación Ubicación Ubicación recibida + Conversación cerrada + Has salido de la conversación + No confiar en los CAs del sistema + Todos los certificados deben ser aprobados manualmente Seleccionado %d contacto Seleccionados %d contactos diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index b6d1fa3c..3c9dee1b 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -359,7 +359,6 @@ Pasahitza ezin izan da aldatu Mezu bat bidali enkripatutako elkarrizketa hasteko Galdetu - Zu eta zure kontaktua beste inor ezagutzen ez duen elkarren arteko sekreturen bat baduzue (ohiko txantxa edo azkenengo aldian bazkaldu zenutena adibidez) bakoitzaren hatz-markak egiaztatzeko sekretu hori erabili dezakezue.\n\nIradokizun edo galdera bat eman behar duzu zure kontaktuak erantzun dezan, letra larri eta xeheak bereiziz. Zure kontaktuak zure hatz-marka egiaztatu nahi du partekatutako sekretu batekin erronka eginez. Zure kontaktuak hurrengo iradokizuna edo sekretu horren galdera eman du. Zure iradokizuna ez luke hutsik egon behar Zure partekatutako sekretua ezin da hutsik egon @@ -427,6 +426,8 @@ Kokapena erakutsi dezakeen aplikaziorik ez da aurkitu Kokapena Kokapena jaso da + Elkarrizketa itxi egin da + Konferentzia utzi egin da Hautatu kontaktu %d Hautatu %d kontaktu diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 47c28517..4baef67f 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -359,7 +359,6 @@ Impossible de changer le mot de passe Envoyez un message pour commencer la conversation chiffrée Poser une question - Si vous et votre contact avez un secret en commun connu par vous deux uniquement (comme une histoire personnelle ou même comme ce que vous avez mangé lors de votre dernière rencontre) vous pouvez utiliser ce secret pour vérifier vos empreintes respectives.\n\nVous envoyez un indice ou une question à votre contact qui devra répondre en faisant attention à la casse. Votre contact voudrait vous identifier de manière sûre grâce à un secret commun. Il vous envoie le message ou la question suivante. Votre indice ne devrait pas être vide Votre secret ne peut être vide diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index c32e9585..836dced8 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -357,7 +357,6 @@ Impossibile cambiare la password Invia un messaggio per avviare una conversazione cifrata Fai una domanda - Se tu ed il tuo contatto avete un segreto in comune che nessun’altro conosce (come uno scherzo o semplicemente ciò che avete mangiato a pranzo l’ultima volta che vi siete incontrati), potete usare quel segreto per dimostrare la vostra identità reciprocamente.\n\nFornisci un suggerimento o una domanda al tuo contatto che ti risponderà con una domanda Case Sensitive. Il tuo contatto vorrebbe verificare la tua identità. Dovrai rispondere correttamente alla sua domanda con una risposta che condividete. Il tuo contatto ti ha fornito il suggerimento o la domanda seguente. Il suggerimento non dovrebbe essere vuoto Il segreto condiviso non può essere vuoto diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index baffa088..0996334e 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -427,6 +427,10 @@ 位置を表示するアプリケーションが見つかりません 位置 位置を受信しました + 会話が閉じられました + 退出した会話 + システムの CA を信頼しない + すべての証明書を手動で承認する必要があります %d 連絡先を選択 diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index cb45b4aa..e66bfd19 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -359,7 +359,6 @@ Nepodarilo sa zmeniť heslo Poslať správu pre spustenie šifrovaného chatu Položiť otázku - Ak máte vy a váš kontakt spoločné tajomstvo, ktoré nikto iný nepozná (napríklad spoločný vtip alebo čo ste mali na obed na vašom poslednom stretnutí), môžete ho použiť na overenie vzájomných identifikátorov.\n\nZadáte pomôcku alebo otázku a kontakt na ňu správne odpovie. Váš kontakt by chcel overiť váš identifikátor pomocou spoločného tajomstva. Váš kontakt zadal nasledujúcu pomôcku alebo otázku týkajúcu sa tajomstva. Vaša pomôcka by nemala byť prázdna Vaše spoločné tajomstvo nemôže byť prázdne diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml index 052463c8..3b632cdb 100644 --- a/src/main/res/values-sr/strings.xml +++ b/src/main/res/values-sr/strings.xml @@ -427,6 +427,10 @@ Нема апликације за приказ локације Локација Примљена локација + Преписка затворена + Напусти конференцију + Не веруј системским сертификационим телима + Сви сертификати морају ручно да се одобре Изабери %d контакт Изабери %d контакта diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index 874de244..b411f484 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -427,6 +427,10 @@ Kunde inte hitta applikation för att visa position Position Mottog position + Konversation stängd + Lämnade konferens + Lita inte på systemets CAs + Alla certifikat måste manuellt godkännas Välj %d kontakt Välj %d kontakter -- cgit v1.2.3 From 7f2a83a684023aa7ac59c640be8e877434ebcbe7 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 26 Apr 2015 10:48:36 +0200 Subject: pulled translations from transifex --- src/main/res/values-bg/strings.xml | 11 ++++ src/main/res/values-de/strings.xml | 2 +- src/main/res/values-es/strings.xml | 11 ++++ src/main/res/values-eu/strings.xml | 3 ++ src/main/res/values-it/strings.xml | 43 +++++++++++++++ src/main/res/values-pl/strings.xml | 10 +++- src/main/res/values-ru/strings.xml | 106 +++++++++++++++++++++++++++++++++++++ src/main/res/values-sk/strings.xml | 10 ++++ src/main/res/values-sr/strings.xml | 12 +++++ 9 files changed, 205 insertions(+), 3 deletions(-) (limited to 'src/main/res') diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml index b4810f51..b27481dd 100644 --- a/src/main/res/values-bg/strings.xml +++ b/src/main/res/values-bg/strings.xml @@ -429,8 +429,19 @@ Получено местоположение Conversation се затвори Напуснахте беседата + Настройки на сертификата Да не се вярва на системните сертификати Всички сертификати трябва да бъдат одобрени на ръка + Премахване на сертификатите + Изтриване на сертификатите, одобрени на ръка + Няма сертификати, одобрени на ръка + Премахване на сертификатите + Изтриване на избраните + Отказ + + %d сертификат е изтрит + %d сертификата са изтрити + Изберете %d контакт Изберете %d контакта diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index d5f550a3..08b0d4a5 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -439,7 +439,7 @@ Auswahl löschen Abbrechen - %d Zertifikat gelöscht + %d Zertifikat gelöscht %d Zertifikate gelöscht diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index d7c6a885..16531073 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -429,8 +429,19 @@ Ubicación recibida Conversación cerrada Has salido de la conversación + Opciones de Certificados No confiar en los CAs del sistema Todos los certificados deben ser aprobados manualmente + Eliminar Certificados + Eliminar manualmente certificados aceptados + No aceptar certificados manualmente + Eliminar Certificados + Deshacer selección + Cancelar + + %d certificado eliminado + %d certificados eliminados + Seleccionado %d contacto Seleccionados %d contactos diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index 3c9dee1b..42309661 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -359,6 +359,7 @@ Pasahitza ezin izan da aldatu Mezu bat bidali enkripatutako elkarrizketa hasteko Galdetu + Zu eta zure kontaktua beste inor ezagutzen ez duen elkarren arteko sekreturen bat baduzue (ohiko txantxa edo azkenengo aldian bazkaldu zenutena adibidez) bakoitzaren hatz-markak egiaztatzeko sekretu hori erabili dezakezue.\n\nIradokizun edo galdera bat eman behar duzu zure kontaktuak erantzun dezan, letra larri eta xeheak bereiziz. Zure kontaktuak zure hatz-marka egiaztatu nahi du partekatutako sekretu batekin erronka eginez. Zure kontaktuak hurrengo iradokizuna edo sekretu horren galdera eman du. Zure iradokizuna ez luke hutsik egon behar Zure partekatutako sekretua ezin da hutsik egon @@ -428,6 +429,8 @@ Kokapena jaso da Elkarrizketa itxi egin da Konferentzia utzi egin da + Sistemaren CAtaz ez fidatu + Ziurtagiri guztiak eskuz onartu behar dira Hautatu kontaktu %d Hautatu %d kontaktu diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 836dced8..8960f60b 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -304,6 +304,7 @@ Trasmissione dell’immagine fallita Scansiona codice QR Mostra codice QR + Mostra la black list Dettagli utente Verifica OTR Impronta remota @@ -328,6 +329,7 @@ Scegli file Ricezione di %1$s file (%2$d%% completato) Scarica %s + file Apri %s invio (%1$d%% completato) Preparazione alla trasmissione del file @@ -357,6 +359,7 @@ Impossibile cambiare la password Invia un messaggio per avviare una conversazione cifrata Fai una domanda + Se condividi con il tuo contatto un segreto in comune non conosciuto da altri (come uno scherzo privato o semplicemente quel che avete mangiato l\'ultima volta insieme) potete usarlo per verificare le vostre fingerprint.\n\nInvia un suggerimento o una domanda al tuo contatto il quale dovrà rispondere con una risposta controllando le maiuscole. Il tuo contatto vorrebbe verificare la tua identità. Dovrai rispondere correttamente alla sua domanda con una risposta che condividete. Il tuo contatto ti ha fornito il suggerimento o la domanda seguente. Il suggerimento non dovrebbe essere vuoto Il segreto condiviso non può essere vuoto @@ -399,6 +402,46 @@ Opzioni di ingresso Invio invia Il tasto invio spedisce il messaggio + Mostra il tasto invio + Cambia il tasto delle faccine nel tastodi invio + audio + video + immagine Documento PDF + Applicazione Android + Contatto Ricevuto %s + Tocca per avviare Conversations + Il tuo avatar è stato pubblicato! + Invio %s + Inviando %s + Nascondi i contatti offline + Disabilita l\'account + %s sta digitando... + %s ha smesso di digitare + Permetti al tuo contatto di vedere quando stai digitando + Invia la posizione + Mostra la posizione + Non è stata trovata alcuna applicazione per mostrare la posizione + Posizione + Posizione ricevuta + Conversazione interrotta + Conferenza terminata + Opzioni per i certificati + Non ti fidare delle CA di sistema + Tutti i certificati devono essere accettati manualmente + Elimina i certificati + Cancella manualmente i certificati già accettati + Non sono presenti certificati accettati manualmente + Elimina i certificati + Cancella la selezione + Annulla + + Cancellato il %d certificato + Cancellati %d certificati + + + Seleziona il %d contatto + Selezionati %d contatti + diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 3c58c485..e1849357 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -19,7 +19,7 @@ Ustawienia Szczegóły konferencji Szczegóły kontaktu - Udostępnij przez Conversation + Udostępnij w konwersacji Rozpocznij konwersację Wybierz kontakt Czarna lista @@ -183,6 +183,11 @@ Informacje o serwerze XEP-0313: MAM XEP-0280: Kopie wiadomości + XEP-0352: Client State Indication + XEP-0191: Blocking Command + XEP-0237: Roster Versioning + XEP-0198: Stream Management + XEP-0163: PEP (Avatars) dostępny niedostępny Brak informacji o kluczu publicznym @@ -237,7 +242,7 @@ Połącz Konto już istnieje Dalej - Połączono + Połączono z serwerem Dodatkowe informacje Pomiń Wyłącz powiadomienia @@ -417,4 +422,5 @@ Opuszczono konferencję Nie ufaj certyfikatom systemowym Wymagaj ręcznego potwierdzania certyfikatów + Anuluj diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 0f3ec4c7..fb39e24a 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -283,4 +283,110 @@ Раскрасить кнопку отправить, указывая текущий статус собеседника Другие Название конференции + Использовать тему беседы заместо JID для отображения конференций + OTR-отпечаток скопирован в буфер обмена! + Вы заблокированы в этой конференции + Эта конференция требует членства + Вы были удалены из конференции + использовать учётную запись %s + Проверка изображения на узле HTTP + Файл изображения был удалён + Вы неподключены. Попробуйте позже + Проверить размер файла изображения + Опции сообщения + Копировать текст + Копировать адрес ссылки + Отправить ещё раз + Адрес изображения + Текст сообщения + Ссылка скопирована в буфер обмена + Сообщение скопировано в буфер обмена + Передача изображения не удалась + Поиск QR-кода + Показать QR-код + Показать чёрный список + Сведения об учётной записи + Подтвердить OTR + Удалённый отпечаток + поиск + (или сенсорные телефоны) + Socialist Millionaire Protocol + Подсказка или вопрос + Общий секретный ключ + Подтвердить + В ходе выполнения + Ответ + Не удалось + Ключи не совпадают + Попробуйте ещё раз + Завершить + Подтверждён! + Контакт запросил подтверждение SMP + Действительная OTR-сессия не найдена! + Диалоги + Оставить службу на переднем плане + Не позволяет операционной системе закрыть ваше соединение + Выберите файл + Получение %1$s (%2$d%% выполнено) + Загружено %s + файл + Открыть %s + отправка (%1$d%% выполнено) + Файл готовится для передачи + %s предлагается скачать + Отменить передачу + передача файла не удалась + Файл был удалён + Не найдено приложения для открытия файла + Не удалось подтвердить отпечаток + Ручная проверка + Вы точно хотите подтвердить OTR-отпечатки ваших контактов? + Показывать динамические тэги + Отображать теги только для чтения под контактами + Включить уведомления + Создать конференцию с... + Сервер конференции не был найден + Не удалось создать конференцию! + Конференция создана! + Секретный ключ принят! + Сброс + Изображение учётной записи + Скопировать OTR-отпечаток в буфер обмена + Получение истории с сервера + На сервере больше нет истории + Обновление... + Пароль изменён! + Не удалось изменить пароль + Отправить сообщение чтобы начать зашифрованный чат + Задать вопрос + Если у вас и вашего собеседника есть общая тайна, о которой никто кроме вас не знает (например, шутка, понятная только \"своим\" или что вы ели на обед при последней вашей встрече) вы можете использовать эту тайну, чтобы подтвердить отпечаток друг друга.\n\nВы даёте подсказку или задаёте вопрос вашему контакту, а она даст регистрозависимый ответ. + Ваш собеседник желает проверить ваш отпечаток с помощью общего секрета. Ваш собеседник дал следующую подсказку или вопрос в качестве этого секрета. + Ваша подсказка не может быть пустой + Ваш общий секрет не может быть пустым + Внимательно сверьте отпечаток, показанный ниже с отпечатком вашего собеседника.\nДля обмена ими вы можете использовать любое доверенное средство связи, например, зашифрованное электронное письмо или телефонный звонок. + Изменить пароль + Текущий пароль + Новый пароль + Пароль не может быть пустым + Включить все учётные записи + Отключить все учётные записи + Взаимодействовать с + Не является участником + Нет роли + Заблокированный пользователь + Участник + Расширенный режим + Предоставить участие + Отменить участие + Назначить административные права + Снять административные права + Исключить из конференции + Не удалось изменить принадлежность %s + Запретить доступ к конференции + Вы пытаетесь исключить %s из публичной конференции. Единственный способ — это навсегда запретить доступ пользователю. + Заблокировать + Не удалось сменить роль %s + Публичная конференция + Приватная конференция только для членов + Настройки конференции diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index e66bfd19..aa0fcff7 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -359,6 +359,7 @@ Nepodarilo sa zmeniť heslo Poslať správu pre spustenie šifrovaného chatu Položiť otázku + Ak máte vy a váš kontakt spoločné tajomstvo, ktoré nikto iný nepozná (napríklad nejaký spoločný vtip alebo len čo ste mali na obed, keď ste sa naposledy stretli), môžte použiť toto tajomstvo na overenie vzájomných identifikátorov. \n\nZadáte pomôcku alebo otázku pre váš kontakt, ktorý na ňu správne odpovie. Váš kontakt by chcel overiť váš identifikátor pomocou spoločného tajomstva. Váš kontakt zadal nasledujúcu pomôcku alebo otázku týkajúcu sa tajomstva. Vaša pomôcka by nemala byť prázdna Vaše spoločné tajomstvo nemôže byť prázdne @@ -426,4 +427,13 @@ Nenašla sa aplikácia na zobrazenie polohy Poloha Prijatá poloha + Konverzácia zatvorená + Opustil skupinovú konverzáciu + Nedôverovať systému CAs + Všetky certifikáty musia byť ručne schválené + + Vybrať %d kontaktu + Vybrať %d kontaktu + Vybrať %d kontaktov + diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml index 3b632cdb..bcf420ba 100644 --- a/src/main/res/values-sr/strings.xml +++ b/src/main/res/values-sr/strings.xml @@ -429,8 +429,20 @@ Примљена локација Преписка затворена Напусти конференцију + Опције сертификата Не веруј системским сертификационим телима Сви сертификати морају ручно да се одобре + Уклони сертификате + Обриши ручно одобрене сертификате + Нема ручно одобрених сертификата + Уклањање сертификата + Обриши изабрано + Одустани + + %d сертификат обрисан + %d сертификата обрисана + %d сертификата обрисано + Изабери %d контакт Изабери %d контакта -- cgit v1.2.3 From a4ff8e36337acab6fb3d945159f6d143e825f16b Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 27 Apr 2015 12:19:05 +0200 Subject: increased padding around switches in manage accounts --- src/main/res/layout/account_row.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/main/res') diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml index 94c59111..0e73dd64 100644 --- a/src/main/res/layout/account_row.xml +++ b/src/main/res/layout/account_row.xml @@ -3,7 +3,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?android:attr/activatedBackgroundIndicator" - android:padding="8dp" > + android:paddingLeft="8dp" + android:paddingBottom="8dp" + android:paddingTop="8dp"> @@ -50,6 +51,7 @@ android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_centerVertical="true" + android:padding="8dp" android:focusable="false"/> \ No newline at end of file -- cgit v1.2.3 From 93e942f96d856b4ea2ac2595dd8f76ffa0832db3 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 28 Apr 2015 14:28:51 +0200 Subject: made material icons smaller (24dp) --- src/main/res/drawable-hdpi/ic_add_white_24dp.png | Bin 0 -> 223 bytes src/main/res/drawable-hdpi/ic_add_white_48dp.png | Bin 222 -> 0 bytes .../drawable-hdpi/ic_attach_file_white_24dp.png | Bin 0 -> 452 bytes .../drawable-hdpi/ic_attach_file_white_48dp.png | Bin 870 -> 0 bytes src/main/res/drawable-hdpi/ic_chat_white_48dp.png | Bin 363 -> 0 bytes .../drawable-hdpi/ic_content_copy_grey600_24dp.png | Bin 0 -> 287 bytes .../drawable-hdpi/ic_content_copy_grey600_36dp.png | Bin 348 -> 0 bytes .../res/drawable-hdpi/ic_delete_grey600_24dp.png | Bin 0 -> 248 bytes .../res/drawable-hdpi/ic_delete_white_24dp.png | Bin 0 -> 246 bytes .../res/drawable-hdpi/ic_delete_white_48dp.png | Bin 338 -> 0 bytes .../res/drawable-hdpi/ic_edit_grey600_24dp.png | Bin 0 -> 341 bytes .../res/drawable-hdpi/ic_edit_grey600_36dp.png | Bin 419 -> 0 bytes src/main/res/drawable-hdpi/ic_edit_white_24dp.png | Bin 0 -> 339 bytes src/main/res/drawable-hdpi/ic_edit_white_48dp.png | Bin 490 -> 0 bytes .../res/drawable-hdpi/ic_group_add_white_24dp.png | Bin 0 -> 396 bytes .../res/drawable-hdpi/ic_group_add_white_48dp.png | Bin 722 -> 0 bytes src/main/res/drawable-hdpi/ic_group_white_24dp.png | Bin 0 -> 417 bytes src/main/res/drawable-hdpi/ic_group_white_48dp.png | Bin 599 -> 0 bytes .../drawable-hdpi/ic_import_export_white_24dp.png | Bin 0 -> 300 bytes .../drawable-hdpi/ic_import_export_white_48dp.png | Bin 414 -> 0 bytes .../res/drawable-hdpi/ic_lock_open_white_24dp.png | Bin 0 -> 400 bytes .../res/drawable-hdpi/ic_lock_open_white_48dp.png | Bin 739 -> 0 bytes .../drawable-hdpi/ic_lock_outline_white_48dp.png | Bin 743 -> 0 bytes src/main/res/drawable-hdpi/ic_lock_white_24dp.png | Bin 0 -> 399 bytes .../res/drawable-hdpi/ic_person_add_white_24dp.png | Bin 0 -> 383 bytes .../res/drawable-hdpi/ic_person_add_white_48dp.png | Bin 683 -> 0 bytes .../res/drawable-hdpi/ic_refresh_white_48dp.png | Bin 875 -> 0 bytes .../res/drawable-hdpi/ic_remove_grey600_36dp.png | Bin 217 -> 0 bytes .../res/drawable-hdpi/ic_search_white_24dp.png | Bin 0 -> 504 bytes .../res/drawable-hdpi/ic_search_white_48dp.png | Bin 871 -> 0 bytes .../res/drawable-hdpi/ic_settings_grey600_24dp.png | Bin 0 -> 572 bytes .../res/drawable-hdpi/ic_settings_grey600_36dp.png | Bin 780 -> 0 bytes .../res/drawable-hdpi/ic_warning_white_24dp.png | Bin 0 -> 421 bytes .../res/drawable-hdpi/ic_warning_white_36dp.png | Bin 540 -> 0 bytes src/main/res/drawable-mdpi/ic_add_white_24dp.png | Bin 0 -> 174 bytes src/main/res/drawable-mdpi/ic_add_white_48dp.png | Bin 198 -> 0 bytes .../drawable-mdpi/ic_attach_file_white_24dp.png | Bin 0 -> 332 bytes .../drawable-mdpi/ic_attach_file_white_48dp.png | Bin 576 -> 0 bytes src/main/res/drawable-mdpi/ic_chat_white_48dp.png | Bin 290 -> 0 bytes .../drawable-mdpi/ic_content_copy_grey600_24dp.png | Bin 0 -> 217 bytes .../drawable-mdpi/ic_content_copy_grey600_36dp.png | Bin 287 -> 0 bytes .../res/drawable-mdpi/ic_delete_grey600_24dp.png | Bin 0 -> 199 bytes .../res/drawable-mdpi/ic_delete_white_24dp.png | Bin 0 -> 197 bytes .../res/drawable-mdpi/ic_delete_white_48dp.png | Bin 270 -> 0 bytes .../res/drawable-mdpi/ic_edit_grey600_24dp.png | Bin 0 -> 276 bytes .../res/drawable-mdpi/ic_edit_grey600_36dp.png | Bin 341 -> 0 bytes src/main/res/drawable-mdpi/ic_edit_white_24dp.png | Bin 0 -> 272 bytes src/main/res/drawable-mdpi/ic_edit_white_48dp.png | Bin 378 -> 0 bytes .../res/drawable-mdpi/ic_group_add_white_24dp.png | Bin 0 -> 313 bytes .../res/drawable-mdpi/ic_group_add_white_48dp.png | Bin 484 -> 0 bytes src/main/res/drawable-mdpi/ic_group_white_24dp.png | Bin 0 -> 296 bytes src/main/res/drawable-mdpi/ic_group_white_48dp.png | Bin 464 -> 0 bytes .../drawable-mdpi/ic_import_export_white_24dp.png | Bin 0 -> 226 bytes .../drawable-mdpi/ic_import_export_white_48dp.png | Bin 330 -> 0 bytes .../res/drawable-mdpi/ic_lock_open_white_24dp.png | Bin 0 -> 290 bytes .../res/drawable-mdpi/ic_lock_open_white_48dp.png | Bin 513 -> 0 bytes .../drawable-mdpi/ic_lock_outline_white_48dp.png | Bin 449 -> 0 bytes src/main/res/drawable-mdpi/ic_lock_white_24dp.png | Bin 0 -> 296 bytes .../res/drawable-mdpi/ic_person_add_white_24dp.png | Bin 0 -> 289 bytes .../res/drawable-mdpi/ic_person_add_white_48dp.png | Bin 423 -> 0 bytes .../res/drawable-mdpi/ic_refresh_white_48dp.png | Bin 637 -> 0 bytes .../res/drawable-mdpi/ic_remove_grey600_36dp.png | Bin 197 -> 0 bytes .../res/drawable-mdpi/ic_search_white_24dp.png | Bin 0 -> 346 bytes .../res/drawable-mdpi/ic_search_white_48dp.png | Bin 591 -> 0 bytes .../res/drawable-mdpi/ic_settings_grey600_24dp.png | Bin 0 -> 423 bytes .../res/drawable-mdpi/ic_settings_grey600_36dp.png | Bin 572 -> 0 bytes .../res/drawable-mdpi/ic_warning_white_24dp.png | Bin 0 -> 328 bytes .../res/drawable-mdpi/ic_warning_white_36dp.png | Bin 421 -> 0 bytes src/main/res/drawable-xhdpi/ic_add_white_24dp.png | Bin 0 -> 198 bytes src/main/res/drawable-xhdpi/ic_add_white_48dp.png | Bin 269 -> 0 bytes .../drawable-xhdpi/ic_attach_file_white_24dp.png | Bin 0 -> 576 bytes .../drawable-xhdpi/ic_attach_file_white_48dp.png | Bin 1039 -> 0 bytes src/main/res/drawable-xhdpi/ic_chat_white_48dp.png | Bin 533 -> 0 bytes .../ic_content_copy_grey600_24dp.png | Bin 0 -> 320 bytes .../ic_content_copy_grey600_36dp.png | Bin 435 -> 0 bytes .../res/drawable-xhdpi/ic_delete_grey600_24dp.png | Bin 0 -> 271 bytes .../res/drawable-xhdpi/ic_delete_white_24dp.png | Bin 0 -> 270 bytes .../res/drawable-xhdpi/ic_delete_white_48dp.png | Bin 397 -> 0 bytes .../res/drawable-xhdpi/ic_edit_grey600_24dp.png | Bin 0 -> 379 bytes .../res/drawable-xhdpi/ic_edit_grey600_36dp.png | Bin 493 -> 0 bytes src/main/res/drawable-xhdpi/ic_edit_white_24dp.png | Bin 0 -> 378 bytes src/main/res/drawable-xhdpi/ic_edit_white_48dp.png | Bin 632 -> 0 bytes .../res/drawable-xhdpi/ic_group_add_white_24dp.png | Bin 0 -> 484 bytes .../res/drawable-xhdpi/ic_group_add_white_48dp.png | Bin 935 -> 0 bytes .../res/drawable-xhdpi/ic_group_white_24dp.png | Bin 0 -> 464 bytes .../res/drawable-xhdpi/ic_group_white_48dp.png | Bin 759 -> 0 bytes .../drawable-xhdpi/ic_import_export_white_24dp.png | Bin 0 -> 330 bytes .../drawable-xhdpi/ic_import_export_white_48dp.png | Bin 502 -> 0 bytes .../res/drawable-xhdpi/ic_lock_open_white_24dp.png | Bin 0 -> 513 bytes .../res/drawable-xhdpi/ic_lock_open_white_48dp.png | Bin 946 -> 0 bytes .../drawable-xhdpi/ic_lock_outline_white_48dp.png | Bin 948 -> 0 bytes src/main/res/drawable-xhdpi/ic_lock_white_24dp.png | Bin 0 -> 465 bytes .../drawable-xhdpi/ic_person_add_white_24dp.png | Bin 0 -> 423 bytes .../drawable-xhdpi/ic_person_add_white_48dp.png | Bin 909 -> 0 bytes .../res/drawable-xhdpi/ic_refresh_white_48dp.png | Bin 1148 -> 0 bytes .../res/drawable-xhdpi/ic_remove_grey600_36dp.png | Bin 212 -> 0 bytes .../res/drawable-xhdpi/ic_search_white_24dp.png | Bin 0 -> 591 bytes .../res/drawable-xhdpi/ic_search_white_48dp.png | Bin 1090 -> 0 bytes .../drawable-xhdpi/ic_settings_grey600_24dp.png | Bin 0 -> 704 bytes .../drawable-xhdpi/ic_settings_grey600_36dp.png | Bin 994 -> 0 bytes .../res/drawable-xhdpi/ic_warning_white_24dp.png | Bin 0 -> 460 bytes .../res/drawable-xhdpi/ic_warning_white_36dp.png | Bin 639 -> 0 bytes src/main/res/drawable-xxhdpi/ic_add_white_24dp.png | Bin 0 -> 222 bytes src/main/res/drawable-xxhdpi/ic_add_white_48dp.png | Bin 356 -> 0 bytes .../drawable-xxhdpi/ic_attach_file_white_24dp.png | Bin 0 -> 870 bytes .../drawable-xxhdpi/ic_attach_file_white_48dp.png | Bin 1642 -> 0 bytes .../res/drawable-xxhdpi/ic_chat_white_48dp.png | Bin 717 -> 0 bytes .../ic_content_copy_grey600_24dp.png | Bin 0 -> 435 bytes .../ic_content_copy_grey600_36dp.png | Bin 631 -> 0 bytes .../res/drawable-xxhdpi/ic_delete_grey600_24dp.png | Bin 0 -> 341 bytes .../res/drawable-xxhdpi/ic_delete_white_24dp.png | Bin 0 -> 338 bytes .../res/drawable-xxhdpi/ic_delete_white_48dp.png | Bin 574 -> 0 bytes .../res/drawable-xxhdpi/ic_edit_grey600_24dp.png | Bin 0 -> 493 bytes .../res/drawable-xxhdpi/ic_edit_grey600_36dp.png | Bin 656 -> 0 bytes .../res/drawable-xxhdpi/ic_edit_white_24dp.png | Bin 0 -> 490 bytes .../res/drawable-xxhdpi/ic_edit_white_48dp.png | Bin 843 -> 0 bytes .../drawable-xxhdpi/ic_group_add_white_24dp.png | Bin 0 -> 722 bytes .../drawable-xxhdpi/ic_group_add_white_48dp.png | Bin 1406 -> 0 bytes .../res/drawable-xxhdpi/ic_group_white_24dp.png | Bin 0 -> 599 bytes .../res/drawable-xxhdpi/ic_group_white_48dp.png | Bin 1273 -> 0 bytes .../ic_import_export_white_24dp.png | Bin 0 -> 414 bytes .../ic_import_export_white_48dp.png | Bin 768 -> 0 bytes .../drawable-xxhdpi/ic_lock_open_white_24dp.png | Bin 0 -> 739 bytes .../drawable-xxhdpi/ic_lock_open_white_48dp.png | Bin 1438 -> 0 bytes .../drawable-xxhdpi/ic_lock_outline_white_48dp.png | Bin 1437 -> 0 bytes .../res/drawable-xxhdpi/ic_lock_white_24dp.png | Bin 0 -> 760 bytes .../drawable-xxhdpi/ic_person_add_white_24dp.png | Bin 0 -> 683 bytes .../drawable-xxhdpi/ic_person_add_white_48dp.png | Bin 1346 -> 0 bytes .../res/drawable-xxhdpi/ic_refresh_white_48dp.png | Bin 1704 -> 0 bytes .../res/drawable-xxhdpi/ic_remove_grey600_36dp.png | Bin 278 -> 0 bytes .../res/drawable-xxhdpi/ic_search_white_24dp.png | Bin 0 -> 871 bytes .../res/drawable-xxhdpi/ic_search_white_48dp.png | Bin 1671 -> 0 bytes .../drawable-xxhdpi/ic_settings_grey600_24dp.png | Bin 0 -> 994 bytes .../drawable-xxhdpi/ic_settings_grey600_36dp.png | Bin 1486 -> 0 bytes .../res/drawable-xxhdpi/ic_warning_white_24dp.png | Bin 0 -> 639 bytes .../res/drawable-xxhdpi/ic_warning_white_36dp.png | Bin 1050 -> 0 bytes .../res/drawable-xxxhdpi/ic_add_white_24dp.png | Bin 0 -> 269 bytes .../res/drawable-xxxhdpi/ic_add_white_48dp.png | Bin 470 -> 0 bytes .../drawable-xxxhdpi/ic_attach_file_white_24dp.png | Bin 0 -> 1039 bytes .../drawable-xxxhdpi/ic_attach_file_white_48dp.png | Bin 2215 -> 0 bytes .../res/drawable-xxxhdpi/ic_chat_white_48dp.png | Bin 929 -> 0 bytes .../ic_content_copy_grey600_24dp.png | Bin 0 -> 521 bytes .../ic_content_copy_grey600_36dp.png | Bin 760 -> 0 bytes .../drawable-xxxhdpi/ic_delete_grey600_24dp.png | Bin 0 -> 402 bytes .../res/drawable-xxxhdpi/ic_delete_white_24dp.png | Bin 0 -> 397 bytes .../res/drawable-xxxhdpi/ic_delete_white_48dp.png | Bin 719 -> 0 bytes .../res/drawable-xxxhdpi/ic_edit_grey600_24dp.png | Bin 0 -> 639 bytes .../res/drawable-xxxhdpi/ic_edit_grey600_36dp.png | Bin 846 -> 0 bytes .../res/drawable-xxxhdpi/ic_edit_white_24dp.png | Bin 0 -> 632 bytes .../res/drawable-xxxhdpi/ic_edit_white_48dp.png | Bin 1098 -> 0 bytes .../drawable-xxxhdpi/ic_group_add_white_24dp.png | Bin 0 -> 935 bytes .../drawable-xxxhdpi/ic_group_add_white_48dp.png | Bin 1935 -> 0 bytes .../res/drawable-xxxhdpi/ic_group_white_24dp.png | Bin 0 -> 759 bytes .../res/drawable-xxxhdpi/ic_group_white_48dp.png | Bin 1719 -> 0 bytes .../ic_import_export_white_24dp.png | Bin 0 -> 502 bytes .../ic_import_export_white_48dp.png | Bin 1025 -> 0 bytes .../drawable-xxxhdpi/ic_lock_open_white_24dp.png | Bin 0 -> 946 bytes .../drawable-xxxhdpi/ic_lock_open_white_48dp.png | Bin 1872 -> 0 bytes .../ic_lock_outline_white_48dp.png | Bin 1874 -> 0 bytes .../res/drawable-xxxhdpi/ic_lock_white_24dp.png | Bin 0 -> 971 bytes .../drawable-xxxhdpi/ic_person_add_white_24dp.png | Bin 0 -> 909 bytes .../drawable-xxxhdpi/ic_person_add_white_48dp.png | Bin 1729 -> 0 bytes .../res/drawable-xxxhdpi/ic_refresh_white_48dp.png | Bin 2312 -> 0 bytes .../drawable-xxxhdpi/ic_remove_grey600_36dp.png | Bin 341 -> 0 bytes .../res/drawable-xxxhdpi/ic_search_white_24dp.png | Bin 0 -> 1090 bytes .../res/drawable-xxxhdpi/ic_search_white_48dp.png | Bin 2279 -> 0 bytes .../drawable-xxxhdpi/ic_settings_grey600_24dp.png | Bin 0 -> 1299 bytes .../drawable-xxxhdpi/ic_settings_grey600_36dp.png | Bin 1978 -> 0 bytes .../res/drawable-xxxhdpi/ic_warning_white_24dp.png | Bin 0 -> 887 bytes .../res/drawable-xxxhdpi/ic_warning_white_36dp.png | Bin 1324 -> 0 bytes src/main/res/values-v21/themes.xml | 32 ++++++++++----------- 171 files changed, 15 insertions(+), 17 deletions(-) create mode 100644 src/main/res/drawable-hdpi/ic_add_white_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_add_white_48dp.png create mode 100644 src/main/res/drawable-hdpi/ic_attach_file_white_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_attach_file_white_48dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_chat_white_48dp.png create mode 100644 src/main/res/drawable-hdpi/ic_content_copy_grey600_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_content_copy_grey600_36dp.png create mode 100644 src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png create mode 100644 src/main/res/drawable-hdpi/ic_delete_white_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_delete_white_48dp.png create mode 100644 src/main/res/drawable-hdpi/ic_edit_grey600_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png create mode 100644 src/main/res/drawable-hdpi/ic_edit_white_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_edit_white_48dp.png create mode 100644 src/main/res/drawable-hdpi/ic_group_add_white_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_group_add_white_48dp.png create mode 100644 src/main/res/drawable-hdpi/ic_group_white_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_group_white_48dp.png create mode 100644 src/main/res/drawable-hdpi/ic_import_export_white_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_import_export_white_48dp.png create mode 100644 src/main/res/drawable-hdpi/ic_lock_open_white_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_lock_open_white_48dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_lock_outline_white_48dp.png create mode 100644 src/main/res/drawable-hdpi/ic_lock_white_24dp.png create mode 100644 src/main/res/drawable-hdpi/ic_person_add_white_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_person_add_white_48dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_refresh_white_48dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png create mode 100644 src/main/res/drawable-hdpi/ic_search_white_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_search_white_48dp.png create mode 100644 src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png create mode 100644 src/main/res/drawable-hdpi/ic_warning_white_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_warning_white_36dp.png create mode 100644 src/main/res/drawable-mdpi/ic_add_white_24dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_add_white_48dp.png create mode 100644 src/main/res/drawable-mdpi/ic_attach_file_white_24dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_attach_file_white_48dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_chat_white_48dp.png create mode 100644 src/main/res/drawable-mdpi/ic_content_copy_grey600_24dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_content_copy_grey600_36dp.png create mode 100644 src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png create mode 100644 src/main/res/drawable-mdpi/ic_delete_white_24dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_delete_white_48dp.png create mode 100644 src/main/res/drawable-mdpi/ic_edit_grey600_24dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png create mode 100644 src/main/res/drawable-mdpi/ic_edit_white_24dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_edit_white_48dp.png create mode 100644 src/main/res/drawable-mdpi/ic_group_add_white_24dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_group_add_white_48dp.png create mode 100644 src/main/res/drawable-mdpi/ic_group_white_24dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_group_white_48dp.png create mode 100644 src/main/res/drawable-mdpi/ic_import_export_white_24dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_import_export_white_48dp.png create mode 100644 src/main/res/drawable-mdpi/ic_lock_open_white_24dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_lock_open_white_48dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_lock_outline_white_48dp.png create mode 100644 src/main/res/drawable-mdpi/ic_lock_white_24dp.png create mode 100644 src/main/res/drawable-mdpi/ic_person_add_white_24dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_person_add_white_48dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_refresh_white_48dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_remove_grey600_36dp.png create mode 100644 src/main/res/drawable-mdpi/ic_search_white_24dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_search_white_48dp.png create mode 100644 src/main/res/drawable-mdpi/ic_settings_grey600_24dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_settings_grey600_36dp.png create mode 100644 src/main/res/drawable-mdpi/ic_warning_white_24dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_warning_white_36dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_add_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_add_white_48dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_attach_file_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_attach_file_white_48dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_chat_white_48dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_content_copy_grey600_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_content_copy_grey600_36dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_delete_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_delete_white_48dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_edit_grey600_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_edit_grey600_36dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_edit_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_edit_white_48dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_group_add_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_group_add_white_48dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_group_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_group_white_48dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_import_export_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_import_export_white_48dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_lock_open_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_lock_open_white_48dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_lock_outline_white_48dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_lock_white_24dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_person_add_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_person_add_white_48dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_refresh_white_48dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_remove_grey600_36dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_search_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_search_white_48dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_settings_grey600_36dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_warning_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_warning_white_36dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_add_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_add_white_48dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_attach_file_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_attach_file_white_48dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_content_copy_grey600_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_content_copy_grey600_36dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_edit_grey600_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_edit_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_group_add_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_group_add_white_48dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_group_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_group_white_48dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_import_export_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_import_export_white_48dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_lock_open_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_lock_open_white_48dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_lock_outline_white_48dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_person_add_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_person_add_white_48dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_search_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_search_white_48dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_warning_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_add_white_48dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_attach_file_white_24dp.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_attach_file_white_48dp.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_chat_white_48dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_24dp.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_36dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_delete_grey600_24dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_edit_grey600_24dp.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_edit_white_24dp.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_group_add_white_24dp.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_group_add_white_48dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_group_white_24dp.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_group_white_48dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_import_export_white_24dp.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_import_export_white_48dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_lock_open_white_24dp.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_lock_open_white_48dp.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_lock_outline_white_48dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_lock_white_24dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_person_add_white_24dp.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_person_add_white_48dp.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_refresh_white_48dp.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_remove_grey600_36dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_search_white_24dp.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_settings_grey600_36dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_warning_white_24dp.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_warning_white_36dp.png (limited to 'src/main/res') diff --git a/src/main/res/drawable-hdpi/ic_add_white_24dp.png b/src/main/res/drawable-hdpi/ic_add_white_24dp.png new file mode 100644 index 00000000..481643ec Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_add_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_add_white_48dp.png b/src/main/res/drawable-hdpi/ic_add_white_48dp.png deleted file mode 100644 index 72cedcad..00000000 Binary files a/src/main/res/drawable-hdpi/ic_add_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_attach_file_white_24dp.png b/src/main/res/drawable-hdpi/ic_attach_file_white_24dp.png new file mode 100644 index 00000000..66299b88 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_attach_file_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-hdpi/ic_attach_file_white_48dp.png deleted file mode 100644 index 7256ca3d..00000000 Binary files a/src/main/res/drawable-hdpi/ic_attach_file_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_chat_white_48dp.png b/src/main/res/drawable-hdpi/ic_chat_white_48dp.png deleted file mode 100644 index 71cac75a..00000000 Binary files a/src/main/res/drawable-hdpi/ic_chat_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_content_copy_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_content_copy_grey600_24dp.png new file mode 100644 index 00000000..5592d5c8 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_content_copy_grey600_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_content_copy_grey600_36dp.png deleted file mode 100644 index bd2c60b8..00000000 Binary files a/src/main/res/drawable-hdpi/ic_content_copy_grey600_36dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png new file mode 100644 index 00000000..b72a9f3c Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_delete_white_24dp.png b/src/main/res/drawable-hdpi/ic_delete_white_24dp.png new file mode 100644 index 00000000..a9eac0ca Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_delete_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_delete_white_48dp.png b/src/main/res/drawable-hdpi/ic_delete_white_48dp.png deleted file mode 100644 index 0e95e9b1..00000000 Binary files a/src/main/res/drawable-hdpi/ic_delete_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_edit_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_edit_grey600_24dp.png new file mode 100644 index 00000000..b5f88c80 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_edit_grey600_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png deleted file mode 100644 index f8970cb2..00000000 Binary files a/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_edit_white_24dp.png b/src/main/res/drawable-hdpi/ic_edit_white_24dp.png new file mode 100644 index 00000000..730416c9 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_edit_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_edit_white_48dp.png b/src/main/res/drawable-hdpi/ic_edit_white_48dp.png deleted file mode 100644 index 34ec7092..00000000 Binary files a/src/main/res/drawable-hdpi/ic_edit_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_group_add_white_24dp.png b/src/main/res/drawable-hdpi/ic_group_add_white_24dp.png new file mode 100644 index 00000000..d96c584c Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_group_add_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-hdpi/ic_group_add_white_48dp.png deleted file mode 100644 index a5ad0a29..00000000 Binary files a/src/main/res/drawable-hdpi/ic_group_add_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_group_white_24dp.png b/src/main/res/drawable-hdpi/ic_group_white_24dp.png new file mode 100644 index 00000000..dada448f Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_group_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_group_white_48dp.png b/src/main/res/drawable-hdpi/ic_group_white_48dp.png deleted file mode 100644 index a6ed594f..00000000 Binary files a/src/main/res/drawable-hdpi/ic_group_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_import_export_white_24dp.png b/src/main/res/drawable-hdpi/ic_import_export_white_24dp.png new file mode 100644 index 00000000..705a4cc7 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_import_export_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-hdpi/ic_import_export_white_48dp.png deleted file mode 100644 index c3497037..00000000 Binary files a/src/main/res/drawable-hdpi/ic_import_export_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_lock_open_white_24dp.png b/src/main/res/drawable-hdpi/ic_lock_open_white_24dp.png new file mode 100644 index 00000000..1f582254 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_lock_open_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-hdpi/ic_lock_open_white_48dp.png deleted file mode 100644 index b90a5980..00000000 Binary files a/src/main/res/drawable-hdpi/ic_lock_open_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-hdpi/ic_lock_outline_white_48dp.png deleted file mode 100644 index d0c25290..00000000 Binary files a/src/main/res/drawable-hdpi/ic_lock_outline_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_lock_white_24dp.png b/src/main/res/drawable-hdpi/ic_lock_white_24dp.png new file mode 100644 index 00000000..b94735ec Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_lock_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_person_add_white_24dp.png b/src/main/res/drawable-hdpi/ic_person_add_white_24dp.png new file mode 100644 index 00000000..53341908 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_person_add_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-hdpi/ic_person_add_white_48dp.png deleted file mode 100644 index 074db2d3..00000000 Binary files a/src/main/res/drawable-hdpi/ic_person_add_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-hdpi/ic_refresh_white_48dp.png deleted file mode 100644 index 72128fe6..00000000 Binary files a/src/main/res/drawable-hdpi/ic_refresh_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png deleted file mode 100644 index aeb1cea9..00000000 Binary files a/src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_search_white_24dp.png b/src/main/res/drawable-hdpi/ic_search_white_24dp.png new file mode 100644 index 00000000..a2fc5b2e Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_search_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_search_white_48dp.png b/src/main/res/drawable-hdpi/ic_search_white_48dp.png deleted file mode 100644 index 0bbeab15..00000000 Binary files a/src/main/res/drawable-hdpi/ic_search_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png new file mode 100644 index 00000000..20d2b66e Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png deleted file mode 100644 index cff84744..00000000 Binary files a/src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_warning_white_24dp.png b/src/main/res/drawable-hdpi/ic_warning_white_24dp.png new file mode 100644 index 00000000..30eee6c4 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_warning_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_warning_white_36dp.png b/src/main/res/drawable-hdpi/ic_warning_white_36dp.png deleted file mode 100644 index c8b7140a..00000000 Binary files a/src/main/res/drawable-hdpi/ic_warning_white_36dp.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_add_white_24dp.png b/src/main/res/drawable-mdpi/ic_add_white_24dp.png new file mode 100644 index 00000000..977dd342 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_add_white_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_add_white_48dp.png b/src/main/res/drawable-mdpi/ic_add_white_48dp.png deleted file mode 100644 index 67042105..00000000 Binary files a/src/main/res/drawable-mdpi/ic_add_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_attach_file_white_24dp.png b/src/main/res/drawable-mdpi/ic_attach_file_white_24dp.png new file mode 100644 index 00000000..fc62a5bf Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_attach_file_white_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-mdpi/ic_attach_file_white_48dp.png deleted file mode 100644 index db23fd65..00000000 Binary files a/src/main/res/drawable-mdpi/ic_attach_file_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_chat_white_48dp.png b/src/main/res/drawable-mdpi/ic_chat_white_48dp.png deleted file mode 100644 index 526ebec6..00000000 Binary files a/src/main/res/drawable-mdpi/ic_chat_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_content_copy_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_content_copy_grey600_24dp.png new file mode 100644 index 00000000..bab9b4d6 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_content_copy_grey600_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_content_copy_grey600_36dp.png deleted file mode 100644 index 5592d5c8..00000000 Binary files a/src/main/res/drawable-mdpi/ic_content_copy_grey600_36dp.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png new file mode 100644 index 00000000..e757fdb0 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_delete_white_24dp.png b/src/main/res/drawable-mdpi/ic_delete_white_24dp.png new file mode 100644 index 00000000..e4ea52ef Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_delete_white_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_delete_white_48dp.png b/src/main/res/drawable-mdpi/ic_delete_white_48dp.png deleted file mode 100644 index cdb230c2..00000000 Binary files a/src/main/res/drawable-mdpi/ic_delete_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_edit_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_edit_grey600_24dp.png new file mode 100644 index 00000000..bae3480c Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_edit_grey600_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png deleted file mode 100644 index b5f88c80..00000000 Binary files a/src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_edit_white_24dp.png b/src/main/res/drawable-mdpi/ic_edit_white_24dp.png new file mode 100644 index 00000000..85cff0b9 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_edit_white_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_edit_white_48dp.png b/src/main/res/drawable-mdpi/ic_edit_white_48dp.png deleted file mode 100644 index 7f0ea51b..00000000 Binary files a/src/main/res/drawable-mdpi/ic_edit_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_group_add_white_24dp.png b/src/main/res/drawable-mdpi/ic_group_add_white_24dp.png new file mode 100644 index 00000000..d0ef7ee8 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_group_add_white_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-mdpi/ic_group_add_white_48dp.png deleted file mode 100644 index 6055325e..00000000 Binary files a/src/main/res/drawable-mdpi/ic_group_add_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_group_white_24dp.png b/src/main/res/drawable-mdpi/ic_group_white_24dp.png new file mode 100644 index 00000000..ff2a916b Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_group_white_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_group_white_48dp.png b/src/main/res/drawable-mdpi/ic_group_white_48dp.png deleted file mode 100644 index 0c5fd333..00000000 Binary files a/src/main/res/drawable-mdpi/ic_group_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_import_export_white_24dp.png b/src/main/res/drawable-mdpi/ic_import_export_white_24dp.png new file mode 100644 index 00000000..5f6e11bc Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_import_export_white_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-mdpi/ic_import_export_white_48dp.png deleted file mode 100644 index fb82f420..00000000 Binary files a/src/main/res/drawable-mdpi/ic_import_export_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_lock_open_white_24dp.png b/src/main/res/drawable-mdpi/ic_lock_open_white_24dp.png new file mode 100644 index 00000000..ab9efde0 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_lock_open_white_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-mdpi/ic_lock_open_white_48dp.png deleted file mode 100644 index 6e1321e4..00000000 Binary files a/src/main/res/drawable-mdpi/ic_lock_open_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-mdpi/ic_lock_outline_white_48dp.png deleted file mode 100644 index 2d2c9417..00000000 Binary files a/src/main/res/drawable-mdpi/ic_lock_outline_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_lock_white_24dp.png b/src/main/res/drawable-mdpi/ic_lock_white_24dp.png new file mode 100644 index 00000000..381b6a11 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_lock_white_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_person_add_white_24dp.png b/src/main/res/drawable-mdpi/ic_person_add_white_24dp.png new file mode 100644 index 00000000..d0857a49 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_person_add_white_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-mdpi/ic_person_add_white_48dp.png deleted file mode 100644 index c402e8f0..00000000 Binary files a/src/main/res/drawable-mdpi/ic_person_add_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-mdpi/ic_refresh_white_48dp.png deleted file mode 100644 index 5f89fc25..00000000 Binary files a/src/main/res/drawable-mdpi/ic_refresh_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_remove_grey600_36dp.png deleted file mode 100644 index efc9560e..00000000 Binary files a/src/main/res/drawable-mdpi/ic_remove_grey600_36dp.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_search_white_24dp.png b/src/main/res/drawable-mdpi/ic_search_white_24dp.png new file mode 100644 index 00000000..dff1e3a8 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_search_white_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_search_white_48dp.png b/src/main/res/drawable-mdpi/ic_search_white_48dp.png deleted file mode 100644 index 043759ac..00000000 Binary files a/src/main/res/drawable-mdpi/ic_search_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_settings_grey600_24dp.png new file mode 100644 index 00000000..5a1b41f0 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_settings_grey600_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_settings_grey600_36dp.png deleted file mode 100644 index 20d2b66e..00000000 Binary files a/src/main/res/drawable-mdpi/ic_settings_grey600_36dp.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_warning_white_24dp.png b/src/main/res/drawable-mdpi/ic_warning_white_24dp.png new file mode 100644 index 00000000..385c0f68 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_warning_white_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_warning_white_36dp.png b/src/main/res/drawable-mdpi/ic_warning_white_36dp.png deleted file mode 100644 index 30eee6c4..00000000 Binary files a/src/main/res/drawable-mdpi/ic_warning_white_36dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_add_white_24dp.png b/src/main/res/drawable-xhdpi/ic_add_white_24dp.png new file mode 100644 index 00000000..67042105 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_add_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_add_white_48dp.png b/src/main/res/drawable-xhdpi/ic_add_white_48dp.png deleted file mode 100644 index 2bef0595..00000000 Binary files a/src/main/res/drawable-xhdpi/ic_add_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_attach_file_white_24dp.png b/src/main/res/drawable-xhdpi/ic_attach_file_white_24dp.png new file mode 100644 index 00000000..db23fd65 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_attach_file_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-xhdpi/ic_attach_file_white_48dp.png deleted file mode 100644 index caaee37a..00000000 Binary files a/src/main/res/drawable-xhdpi/ic_attach_file_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_chat_white_48dp.png b/src/main/res/drawable-xhdpi/ic_chat_white_48dp.png deleted file mode 100644 index 1230ab39..00000000 Binary files a/src/main/res/drawable-xhdpi/ic_chat_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_content_copy_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_content_copy_grey600_24dp.png new file mode 100644 index 00000000..68ccece6 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_content_copy_grey600_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-xhdpi/ic_content_copy_grey600_36dp.png deleted file mode 100644 index 2fdbbea1..00000000 Binary files a/src/main/res/drawable-xhdpi/ic_content_copy_grey600_36dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png new file mode 100644 index 00000000..c6bb43e8 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png b/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png new file mode 100644 index 00000000..cdb230c2 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_delete_white_48dp.png b/src/main/res/drawable-xhdpi/ic_delete_white_48dp.png deleted file mode 100644 index ccf8c716..00000000 Binary files a/src/main/res/drawable-xhdpi/ic_delete_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_edit_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_edit_grey600_24dp.png new file mode 100644 index 00000000..4c95bd57 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_edit_grey600_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-xhdpi/ic_edit_grey600_36dp.png deleted file mode 100644 index 6ed4351c..00000000 Binary files a/src/main/res/drawable-xhdpi/ic_edit_grey600_36dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_edit_white_24dp.png b/src/main/res/drawable-xhdpi/ic_edit_white_24dp.png new file mode 100644 index 00000000..7f0ea51b Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_edit_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_edit_white_48dp.png b/src/main/res/drawable-xhdpi/ic_edit_white_48dp.png deleted file mode 100644 index 9380370f..00000000 Binary files a/src/main/res/drawable-xhdpi/ic_edit_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_group_add_white_24dp.png b/src/main/res/drawable-xhdpi/ic_group_add_white_24dp.png new file mode 100644 index 00000000..6055325e Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_group_add_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-xhdpi/ic_group_add_white_48dp.png deleted file mode 100644 index 0ac3d4a8..00000000 Binary files a/src/main/res/drawable-xhdpi/ic_group_add_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_group_white_24dp.png b/src/main/res/drawable-xhdpi/ic_group_white_24dp.png new file mode 100644 index 00000000..0c5fd333 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_group_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_group_white_48dp.png b/src/main/res/drawable-xhdpi/ic_group_white_48dp.png deleted file mode 100644 index a62b5677..00000000 Binary files a/src/main/res/drawable-xhdpi/ic_group_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_import_export_white_24dp.png b/src/main/res/drawable-xhdpi/ic_import_export_white_24dp.png new file mode 100644 index 00000000..fb82f420 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_import_export_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-xhdpi/ic_import_export_white_48dp.png deleted file mode 100644 index 06b27ea1..00000000 Binary files a/src/main/res/drawable-xhdpi/ic_import_export_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_lock_open_white_24dp.png b/src/main/res/drawable-xhdpi/ic_lock_open_white_24dp.png new file mode 100644 index 00000000..6e1321e4 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_lock_open_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-xhdpi/ic_lock_open_white_48dp.png deleted file mode 100644 index 8f35034c..00000000 Binary files a/src/main/res/drawable-xhdpi/ic_lock_open_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-xhdpi/ic_lock_outline_white_48dp.png deleted file mode 100644 index 3de35f9b..00000000 Binary files a/src/main/res/drawable-xhdpi/ic_lock_outline_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png b/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png new file mode 100644 index 00000000..c5e9d0b4 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_person_add_white_24dp.png b/src/main/res/drawable-xhdpi/ic_person_add_white_24dp.png new file mode 100644 index 00000000..c402e8f0 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_person_add_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-xhdpi/ic_person_add_white_48dp.png deleted file mode 100644 index 4e2121e5..00000000 Binary files a/src/main/res/drawable-xhdpi/ic_person_add_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-xhdpi/ic_refresh_white_48dp.png deleted file mode 100644 index d271d8e0..00000000 Binary files a/src/main/res/drawable-xhdpi/ic_refresh_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-xhdpi/ic_remove_grey600_36dp.png deleted file mode 100644 index 3d5136fe..00000000 Binary files a/src/main/res/drawable-xhdpi/ic_remove_grey600_36dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_search_white_24dp.png b/src/main/res/drawable-xhdpi/ic_search_white_24dp.png new file mode 100644 index 00000000..043759ac Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_search_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_search_white_48dp.png b/src/main/res/drawable-xhdpi/ic_search_white_48dp.png deleted file mode 100644 index 70c21baf..00000000 Binary files a/src/main/res/drawable-xhdpi/ic_search_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png new file mode 100644 index 00000000..2251d2bb Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-xhdpi/ic_settings_grey600_36dp.png deleted file mode 100644 index 6a70402b..00000000 Binary files a/src/main/res/drawable-xhdpi/ic_settings_grey600_36dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_warning_white_24dp.png b/src/main/res/drawable-xhdpi/ic_warning_white_24dp.png new file mode 100644 index 00000000..6eb7943c Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_warning_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_warning_white_36dp.png b/src/main/res/drawable-xhdpi/ic_warning_white_36dp.png deleted file mode 100644 index 3f401317..00000000 Binary files a/src/main/res/drawable-xhdpi/ic_warning_white_36dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png new file mode 100644 index 00000000..72cedcad Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_add_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_add_white_48dp.png deleted file mode 100644 index b12e040e..00000000 Binary files a/src/main/res/drawable-xxhdpi/ic_add_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_attach_file_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_attach_file_white_24dp.png new file mode 100644 index 00000000..7256ca3d Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_attach_file_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_attach_file_white_48dp.png deleted file mode 100644 index b50e5161..00000000 Binary files a/src/main/res/drawable-xxhdpi/ic_attach_file_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png deleted file mode 100644 index bb39d157..00000000 Binary files a/src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_24dp.png new file mode 100644 index 00000000..2fdbbea1 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_36dp.png deleted file mode 100644 index 72b3474b..00000000 Binary files a/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_36dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png new file mode 100644 index 00000000..4886ab1e Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png new file mode 100644 index 00000000..0e95e9b1 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png deleted file mode 100644 index a8d8ca84..00000000 Binary files a/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_edit_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_edit_grey600_24dp.png new file mode 100644 index 00000000..6ed4351c Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_edit_grey600_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png deleted file mode 100644 index 21b617a9..00000000 Binary files a/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_edit_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_edit_white_24dp.png new file mode 100644 index 00000000..34ec7092 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_edit_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png deleted file mode 100644 index fe5bd13f..00000000 Binary files a/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_group_add_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_group_add_white_24dp.png new file mode 100644 index 00000000..a5ad0a29 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_group_add_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_group_add_white_48dp.png deleted file mode 100644 index 7ff60d6f..00000000 Binary files a/src/main/res/drawable-xxhdpi/ic_group_add_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_group_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_group_white_24dp.png new file mode 100644 index 00000000..a6ed594f Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_group_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_group_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_group_white_48dp.png deleted file mode 100644 index fffa6a6a..00000000 Binary files a/src/main/res/drawable-xxhdpi/ic_group_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_import_export_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_import_export_white_24dp.png new file mode 100644 index 00000000..c3497037 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_import_export_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_import_export_white_48dp.png deleted file mode 100644 index cabd50c0..00000000 Binary files a/src/main/res/drawable-xxhdpi/ic_import_export_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_lock_open_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_lock_open_white_24dp.png new file mode 100644 index 00000000..b90a5980 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_lock_open_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_lock_open_white_48dp.png deleted file mode 100644 index 031eb06e..00000000 Binary files a/src/main/res/drawable-xxhdpi/ic_lock_open_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_lock_outline_white_48dp.png deleted file mode 100644 index f57082d8..00000000 Binary files a/src/main/res/drawable-xxhdpi/ic_lock_outline_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png new file mode 100644 index 00000000..0dcada81 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_person_add_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_person_add_white_24dp.png new file mode 100644 index 00000000..074db2d3 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_person_add_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_person_add_white_48dp.png deleted file mode 100644 index ba242487..00000000 Binary files a/src/main/res/drawable-xxhdpi/ic_person_add_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png deleted file mode 100644 index 87ab2d64..00000000 Binary files a/src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png deleted file mode 100644 index 4b1003db..00000000 Binary files a/src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png new file mode 100644 index 00000000..0bbeab15 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png deleted file mode 100644 index 75d9aa69..00000000 Binary files a/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png new file mode 100644 index 00000000..6a70402b Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png deleted file mode 100644 index d47d042e..00000000 Binary files a/src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_warning_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_warning_white_24dp.png new file mode 100644 index 00000000..3f401317 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_warning_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png deleted file mode 100644 index a6e5788b..00000000 Binary files a/src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png new file mode 100644 index 00000000..2bef0595 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_add_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_add_white_48dp.png deleted file mode 100644 index cd32f0a8..00000000 Binary files a/src/main/res/drawable-xxxhdpi/ic_add_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_file_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_attach_file_white_24dp.png new file mode 100644 index 00000000..caaee37a Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_attach_file_white_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_attach_file_white_48dp.png deleted file mode 100644 index 55464b7e..00000000 Binary files a/src/main/res/drawable-xxxhdpi/ic_attach_file_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/ic_chat_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_chat_white_48dp.png deleted file mode 100644 index 68f14af6..00000000 Binary files a/src/main/res/drawable-xxxhdpi/ic_chat_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_24dp.png new file mode 100644 index 00000000..1eb62d42 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_36dp.png deleted file mode 100644 index 435c087a..00000000 Binary files a/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_36dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/ic_delete_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_delete_grey600_24dp.png new file mode 100644 index 00000000..e4e21812 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_delete_grey600_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png new file mode 100644 index 00000000..ccf8c716 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png deleted file mode 100644 index 47fef5aa..00000000 Binary files a/src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_grey600_24dp.png new file mode 100644 index 00000000..0c0fd76f Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_edit_grey600_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png deleted file mode 100644 index 1361eedc..00000000 Binary files a/src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_white_24dp.png new file mode 100644 index 00000000..9380370f Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_edit_white_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png deleted file mode 100644 index 73680649..00000000 Binary files a/src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/ic_group_add_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_group_add_white_24dp.png new file mode 100644 index 00000000..0ac3d4a8 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_group_add_white_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_group_add_white_48dp.png deleted file mode 100644 index 7e9d67f6..00000000 Binary files a/src/main/res/drawable-xxxhdpi/ic_group_add_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/ic_group_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_group_white_24dp.png new file mode 100644 index 00000000..a62b5677 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_group_white_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_group_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_group_white_48dp.png deleted file mode 100644 index 2a27316b..00000000 Binary files a/src/main/res/drawable-xxxhdpi/ic_group_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/ic_import_export_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_import_export_white_24dp.png new file mode 100644 index 00000000..06b27ea1 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_import_export_white_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_import_export_white_48dp.png deleted file mode 100644 index ea80bc00..00000000 Binary files a/src/main/res/drawable-xxxhdpi/ic_import_export_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_open_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_open_white_24dp.png new file mode 100644 index 00000000..8f35034c Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_lock_open_white_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_open_white_48dp.png deleted file mode 100644 index f7652e60..00000000 Binary files a/src/main/res/drawable-xxxhdpi/ic_lock_open_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_outline_white_48dp.png deleted file mode 100644 index 440070a1..00000000 Binary files a/src/main/res/drawable-xxxhdpi/ic_lock_outline_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_white_24dp.png new file mode 100644 index 00000000..a70c55b7 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_lock_white_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_person_add_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_person_add_white_24dp.png new file mode 100644 index 00000000..4e2121e5 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_person_add_white_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_person_add_white_48dp.png deleted file mode 100644 index 89c1aef2..00000000 Binary files a/src/main/res/drawable-xxxhdpi/ic_person_add_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_refresh_white_48dp.png deleted file mode 100644 index fe0ae13a..00000000 Binary files a/src/main/res/drawable-xxxhdpi/ic_refresh_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_remove_grey600_36dp.png deleted file mode 100644 index 524cc0a0..00000000 Binary files a/src/main/res/drawable-xxxhdpi/ic_remove_grey600_36dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/ic_search_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_search_white_24dp.png new file mode 100644 index 00000000..70c21baf Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_search_white_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png deleted file mode 100644 index 7caf6c9b..00000000 Binary files a/src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png new file mode 100644 index 00000000..5eba9e8e Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_settings_grey600_36dp.png deleted file mode 100644 index 8fea47f6..00000000 Binary files a/src/main/res/drawable-xxxhdpi/ic_settings_grey600_36dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/ic_warning_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_warning_white_24dp.png new file mode 100644 index 00000000..b80446e7 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_warning_white_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_warning_white_36dp.png b/src/main/res/drawable-xxxhdpi/ic_warning_white_36dp.png deleted file mode 100644 index abc5c7a5..00000000 Binary files a/src/main/res/drawable-xxxhdpi/ic_warning_white_36dp.png and /dev/null differ diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml index 75539533..a1f3d0c5 100644 --- a/src/main/res/values-v21/themes.xml +++ b/src/main/res/values-v21/themes.xml @@ -10,25 +10,23 @@ 14sp 20sp - @drawable/ic_group_add_white_48dp - @drawable/ic_person_add_white_48dp + @drawable/ic_group_add_white_24dp + @drawable/ic_person_add_white_24dp @drawable/ic_cancel_white_24dp - @drawable/ic_chat_white_48dp - @drawable/ic_content_copy_grey600_36dp - @drawable/ic_delete_white_48dp + @drawable/ic_content_copy_grey600_24dp + @drawable/ic_delete_white_24dp @drawable/ic_file_download_white_24dp - @drawable/ic_edit_white_48dp - @drawable/ic_edit_grey600_36dp - @drawable/ic_group_white_48dp - @drawable/ic_add_white_48dp - @drawable/ic_attach_file_white_48dp - @drawable/ic_lock_open_white_48dp - @drawable/ic_refresh_white_48dp - @drawable/ic_remove_grey600_36dp - @drawable/ic_search_white_48dp - @drawable/ic_lock_outline_white_48dp - @drawable/ic_settings_grey600_36dp - @drawable/ic_import_export_white_48dp + @drawable/ic_edit_white_24dp + @drawable/ic_edit_grey600_24dp + @drawable/ic_group_white_24dp + @drawable/ic_add_white_24dp + @drawable/ic_attach_file_white_24dp + @drawable/ic_lock_open_white_24dp + @drawable/ic_delete_grey600_24dp + @drawable/ic_search_white_24dp + @drawable/ic_lock_open_white_24dp + @drawable/ic_settings_grey600_24dp + @drawable/ic_import_export_white_24dp -- cgit v1.2.3 From 92d14c4a0090c71842440d96be1f84dab5a82d16 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 28 Apr 2015 14:46:52 +0200 Subject: increased padding on image buttons on v21 to match material guidelines --- src/main/res/layout/activity_edit_account.xml | 2 +- src/main/res/layout/activity_muc_details.xml | 4 ++-- src/main/res/layout/contact_key.xml | 2 +- src/main/res/values-v21/dimens.xml | 1 + src/main/res/values/dimens.xml | 7 ++++--- 5 files changed, 9 insertions(+), 7 deletions(-) (limited to 'src/main/res') diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 750c28e0..7d84a4af 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -337,7 +337,7 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:background="?android:selectableItemBackground" - android:padding="8dp" + android:padding="@dimen/image_button_padding" android:src="?attr/icon_copy" android:visibility="visible" android:contentDescription="@string/copy_otr_clipboard_description"/> diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index 36873654..11602651 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -75,7 +75,7 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:background="?android:selectableItemBackground" - android:padding="8dp" + android:padding="@dimen/image_button_padding" android:src="?attr/icon_edit_dark"/> @@ -102,7 +102,7 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:background="?android:selectableItemBackground" - android:padding="8dp" + android:padding="@dimen/image_button_padding" android:src="?attr/icon_settings"/> diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml index 75572877..b7817b38 100644 --- a/src/main/res/layout/contact_key.xml +++ b/src/main/res/layout/contact_key.xml @@ -34,7 +34,7 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:background="?android:selectableItemBackground" - android:padding="8dp" + android:padding="@dimen/image_button_padding" android:src="?attr/icon_remove" android:visibility="invisible" /> diff --git a/src/main/res/values-v21/dimens.xml b/src/main/res/values-v21/dimens.xml index 8bc8f3f7..b689d100 100644 --- a/src/main/res/values-v21/dimens.xml +++ b/src/main/res/values-v21/dimens.xml @@ -1,4 +1,5 @@ 63dp + 12dp \ No newline at end of file diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml index 79e920e9..95e80055 100644 --- a/src/main/res/values/dimens.xml +++ b/src/main/res/values/dimens.xml @@ -1,7 +1,8 @@ - - 8dp - 8dp + + 8dp + 8dp 16dp 288dp + 8dp -- cgit v1.2.3 From d94c231a744900ca7a1297ffd0980536591d61f5 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 28 Apr 2015 16:25:32 +0200 Subject: adjust dimens slightly to work with v21+ (v21 doesn't count the navigation bar) --- .../fragment_conversations_overview.xml | 32 ++++++++++++++++++++++ .../fragment_conversations_overview.xml | 32 ---------------------- src/main/res/values-w585dp/dimens.xml | 4 +++ src/main/res/values-w600dp/dimens.xml | 4 --- src/main/res/values-w945dp/dimens.xml | 3 ++ src/main/res/values-w960dp/dimens.xml | 3 -- 6 files changed, 39 insertions(+), 39 deletions(-) create mode 100644 src/main/res/layout-w945dp/fragment_conversations_overview.xml delete mode 100644 src/main/res/layout-w960dp/fragment_conversations_overview.xml create mode 100644 src/main/res/values-w585dp/dimens.xml delete mode 100644 src/main/res/values-w600dp/dimens.xml create mode 100644 src/main/res/values-w945dp/dimens.xml delete mode 100644 src/main/res/values-w960dp/dimens.xml (limited to 'src/main/res') diff --git a/src/main/res/layout-w945dp/fragment_conversations_overview.xml b/src/main/res/layout-w945dp/fragment_conversations_overview.xml new file mode 100644 index 00000000..50039c03 --- /dev/null +++ b/src/main/res/layout-w945dp/fragment_conversations_overview.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/layout-w960dp/fragment_conversations_overview.xml b/src/main/res/layout-w960dp/fragment_conversations_overview.xml deleted file mode 100644 index 50039c03..00000000 --- a/src/main/res/layout-w960dp/fragment_conversations_overview.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/res/values-w585dp/dimens.xml b/src/main/res/values-w585dp/dimens.xml new file mode 100644 index 00000000..df6525e6 --- /dev/null +++ b/src/main/res/values-w585dp/dimens.xml @@ -0,0 +1,4 @@ + + 416dp + 32dp + diff --git a/src/main/res/values-w600dp/dimens.xml b/src/main/res/values-w600dp/dimens.xml deleted file mode 100644 index df6525e6..00000000 --- a/src/main/res/values-w600dp/dimens.xml +++ /dev/null @@ -1,4 +0,0 @@ - - 416dp - 32dp - diff --git a/src/main/res/values-w945dp/dimens.xml b/src/main/res/values-w945dp/dimens.xml new file mode 100644 index 00000000..146c0e15 --- /dev/null +++ b/src/main/res/values-w945dp/dimens.xml @@ -0,0 +1,3 @@ + + 64dp + diff --git a/src/main/res/values-w960dp/dimens.xml b/src/main/res/values-w960dp/dimens.xml deleted file mode 100644 index 146c0e15..00000000 --- a/src/main/res/values-w960dp/dimens.xml +++ /dev/null @@ -1,3 +0,0 @@ - - 64dp - -- cgit v1.2.3 From f0d51fcb77a728da12179fb8a044b6a78f71eb44 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 29 Apr 2015 10:19:03 +0200 Subject: pulled translations from transifex --- src/main/res/values-cs/strings.xml | 12 + src/main/res/values-es/strings.xml | 2 +- src/main/res/values-eu/strings.xml | 11 + src/main/res/values-id/strings.xml | 104 +++++++++ src/main/res/values-ja/strings.xml | 10 + src/main/res/values-ko/strings.xml | 447 +++++++++++++++++++++++++++++++++++++ src/main/res/values-nl/strings.xml | 11 + src/main/res/values-sv/strings.xml | 11 + 8 files changed, 607 insertions(+), 1 deletion(-) create mode 100644 src/main/res/values-ko/strings.xml (limited to 'src/main/res') diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 192df52f..f49cb1b9 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -429,8 +429,20 @@ Přijmout pozici Conversation zavřena Opustil(a) konferenci + Nastavení certifikátu Nedůvěřovat systémovým CA Všechny certifikáty musí být schváleny ručně + Odstranit certifikáty + Smazat ručně povolené certifikáty + Žádné ručně povolené certifikáty + Odstranit certifikáty + Smazat výběr + Zrušit + + %d certifikát smazán + %d certifikáty smazány + %d certifikátů smazáno + Vybrat %d kontakt Vybrat %d kontakty diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 16531073..109715e3 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -436,7 +436,7 @@ Eliminar manualmente certificados aceptados No aceptar certificados manualmente Eliminar Certificados - Deshacer selección + Eliminar seleccionados Cancelar %d certificado eliminado diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index 42309661..ac66bfc1 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -429,8 +429,19 @@ Kokapena jaso da Elkarrizketa itxi egin da Konferentzia utzi egin da + Ziurtagirien aukerak Sistemaren CAtaz ez fidatu Ziurtagiri guztiak eskuz onartu behar dira + Ziurtagiriak kendu + Eskuz ezabatu onartutako ziurtagiriak + Ez dago eskuz onartutako ziurtagiririk + Ziurtagiriak kendu + Aukeratutakoak ezabatu + Utzi + + Ziurtagiri %d ezabatua + %d ziurtagiri ezabatuak + Hautatu kontaktu %d Hautatu %d kontaktu diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml index 6c2dedb6..69bd0911 100644 --- a/src/main/res/values-id/strings.xml +++ b/src/main/res/values-id/strings.xml @@ -74,6 +74,7 @@ Hapus Riwayat Percakapan Apakah Anda ingin menghapus semua pesan dalam Percakapan ini\n\nPeringatan:ini tidak akan mempengaruhi pesan yang disimpan pada perangkat atau server lain. Hapus pesan + Akhiri percakapan setelahnya Pilih kehadiran untuk kontak Kirim pesan teks biasa Kirim pesan terenskripsi OTR @@ -83,11 +84,13 @@ Kirim tidak terenkripsi Dekripsi gagal. Mungkin Anda tidak memiliki kunci pribadi yang tepat. OpenKeychain + Conversations menggunakan app pihak ke-3 bernama OpenKeychain untuk mengenkripsi dan menerjemahkan pesan dan mengorganisir kunci anda.\n\nOpenKeychain berlisensi GPLv3 dan tersedia fi F-Droid dan Google play.\n\n(Silahkan mulai ulang Conversations setelah menginstall.) Mulai ulang Pasang menawarkan... menunggu... Tidak ada kunci OpenPGP ditemukan + Conversations tidak dapat mengenkripsi pesan Anda karena kontak tidak mengumumkan kunci publiknya.\n\nSilakan meminta kontak Anda untuk menyetel OpenPGP Tidak ada kunci OpenPGP ditemukan Percakapan tidak dapat mengenkripsi pesan Anda karena kontak tidak mengumumkan kunci publik mereka.\n\nSilakan meminta kontak Anda untuk setup OpenPGP. Pesan terenkripsi diterima. Sentuh untuk membongkar dan melihatnya. @@ -154,8 +157,51 @@ Hapus akun Sementara dimatikan Publikasikan avatar + Publikasikan kunci OpenPGP + Aktifkan Akun + Apakah Anda yakin.? + Jika Anda menghapus akun, semua data percakapan Anda di Conversation akan hilang. + Rekam suara + Jabber ID + Password + username@example.com + Ketik ulang password + Password + Ketik ulang password + Password tidak sama + Jabber ID tidak valid + Memori habis. Gambar terlalu besar + Apakah anda ingin menambahkan %s ke daftar kontak anda? + online + bebas untuk chatting + pergi + pergi lama + jangan ganggu + offline + Conference + Member lainnya + Info Server + XEP-0313: MAM + XEP-0280: Message Carbons + XEP-0352: Client State Indication + XEP-0191: Blocking Command + XEP-0237: Roster Versioning + XEP-0198: Stream Management + XEP-0163: PEP (Avatars) + tersedia + tidak tersedia + Pemberitahuan kunci publik tidak ditemukan + terakhir terlihat sekarang + terakhir terlihat 1 menit lalu + terlihat %d menit lalu + terlihat 1 jam lalu + terlihat %d jam lalu + terlihat 1 hari lalu terlihat %d hari lalu tidak pernah terlihat + Pesan terenskripsi. Pasang OpenKeychain untuk menerjemahkan + Sidik OTR tidak diketahui + pesan terkunci OpenPGP ditemukan Penerimaan gagal Fingerprint Anda OTR fingerprint @@ -176,13 +222,30 @@ room@conference.example.com Simpan sebagai bookmark Hapus bookmark + Bookmark ini sudah ada Anda + Ubah subjek conference Conference tidak ditemukan + Tinggalkan + Kontak ditambahkan ke daftar anda Tambah kembali + %s telah membaca hingga disini + Publikasi + Sentuh Avatar untuk memilih gambar dari gallery + Harap dicatat: Setiap orang yang berlangganan update kehadiran Anda akan diizinkan untuk melihat gambar ini. + Mempublikasi... + Server tidak mengijinkan publikasi Anda + Sesuatu yang salah terjadi ketika mengkonversi gambar anda + Tidak dapat menyimpan Avatar ke memori + (Tekan yang lama untuk mengembalikan semula) + Server Anda tidak mendukung publikasi Avatar + berbisik + kepada %s Kirim pesan pribadi ke %s Hubungkan Akun ini sudah ada Selanjutnya + Sesi saat didirikan Informasi tambahan Lewati Nonaktifkan notifikasi @@ -191,7 +254,13 @@ Aktifkan Conference membutuhkan password Masukan password + Pembaruan kehadiran hilang dari kontak + Silakan meminta pembaruan kehadiran dari kontak Anda lebih dulu.\n\nIni akan digunakan untuk menentukan (klien) mana yang digunakan dikontak Anda. + Request sekarang + Hapus sidik jari + Apakah anda yakin menghapus sidik jari? Abaikan + Perhatian Mengirim ini tanpa kehadiran sesama pembaruan bisa menyebabkan masalah tak terduga.\n\nPergi ke kontak untuk memverifikasi langganan kehadiran anda. Pengaturan enskripsi Paksa enskripsi end-to-end Selalu mengirim pesan terenkripsi (kecuali untuk conferences) @@ -205,9 +274,20 @@ Waktu mulai Waktu selesai Aktifkan waktu sunyi + Pemberitahuan akan disunyukan ketika jam sunyi. Perbesar ukuran huruf + Gunakan ukuran huruf lebih besar diseluruh aplikasi Tombol kirim menunjukan statusnya + Permintaan penerimaan pesan + Pesan yang diterima akan ditambahkan centang hijau jika didukung + Warnai tombol kirim untuk mengindikasikan status kontak Lainnya + nama Conference + Gunakan subjek \'room\' daripada JID untuk mengidentifikasi conferences + sidik jari OTR disalin ke clipboard! + Anda ditendang dari conference ini + Conference ini hanya untuk member terdaftar + Anda telah ditendang dari conference ini menggunakan akun %s Mengecek gambar di host HTTP Berkas gambar telah dihapus @@ -226,11 +306,23 @@ Tampilkan kode QR Tampilkan daftar blokir Detil akun + Verifikasi OTR + Remote Sidik jari + pindai + (atau menyentuh telepon) + Socialist Millionaire Protocol + Petunjuk atau Pertanyaan + Rahasia bersama + Konfirmasi Sedang diproses + Menanggapi Gagal + Rahasia tidak match Coba lagi Selesai Terverifikasi! + Kontak meminta verifikasi SMP + Tidak ada sesi OTR yang valid ditemukan! Percakapan Jaga layanan di latar depan Cegah sistem operasi mematikan koneksi @@ -267,6 +359,8 @@ Tidak dapat mengubah password Kirim pesan untuk memulai obrolan dienkripsi Bertanya + Jika Anda dan kontak Anda memiliki rahasia yang sama yang tidak ada orang lain yang tahu (seperti sebuah lelucon atau hanya apa yang Anda punya untuk makan siang terakhir kali Anda bertemu) Anda dapat menggunakan rahasia itu untuk memverifikasi sidik jari masing-masing.\n\nAnda memberikan petunjuk atau pertanyaan untuk kontak yang akan merespon dengan jawaban case-sensitive. + Kontak Anda ingin memverifikasi sidik jari Anda dengan menantang Anda dengan rahasia bersama. Kontak Anda memberikan petunjuk berikut atau pertanyaan untuk rahasia itu. Petunjuk Anda tidak boleh kosong Rahasia bersama Anda tidak boleh kosong Hati-hati membandingkan sidik jari yang ditunjukkan di bawah dengan sidik jari kontak Anda.\nAnda dapat mengunakan layanan komunikasi terpercaya seperti e-mail terenskripsi atau panggilan telepon untuk menukarkannya. @@ -335,8 +429,18 @@ Lokasi yang diterima Percakapan tertutup Tinggalkan conference + Opsi Sertifikat Jangan percaya sistem CA Semua sertifikat harus disetujui secara manual + Hapus sertifikat + Hapus sertifikat yang disahkan secara manual + Tidak ada sertifikat yang disahkan secara manual + Hapus sertifikat + Hapus seleksi + Batal + + %d sertifikat dihapus + Pilih %d kontak diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index 0996334e..35fb5472 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -429,8 +429,18 @@ 位置を受信しました 会話が閉じられました 退出した会話 + 証明書オプション システムの CA を信頼しない すべての証明書を手動で承認する必要があります + 証明書を削除 + 手動で承認された証明書を削除します + 手動で承認された証明書はありません + 証明書を削除 + 選択を削除 + キャンセル + + %d 証明書を削除しました + %d 連絡先を選択 diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml new file mode 100644 index 00000000..d00ab0fd --- /dev/null +++ b/src/main/res/values-ko/strings.xml @@ -0,0 +1,447 @@ + + + 설정 + 새 대화 + 계정 + 이 대화 + 연락처 정보 + 회의 정보 + 안전한 대화 + 계정 추가 + 이름 편집 + 주소록에 추가 + 명단에서 삭제 + 연락처 + 연락처 차단 해제 + 도메인 차단 + 도메인 차단 해제 + 계정 관리 + 설정 + 회의 정보 + 연락처 정보 + 대화 공유 + 대화 시작 + 연락처 선택 + 목록 차단 + 방금 + 1분 전 + %d 분 전 + 읽지 않은 대화 + 보내는중... + 메세지 복호화중입니다. 기다리세요... + 사용중인 별명입니다 + 관리자 + 소유자 + 중재자 + 참가자 + 방문자 + %s 를 당신의 명단에서 삭제하시겠습니까? 이 연락처와 연관된 대화는 삭제되지 않습니다. + %s 이(가) 당신에게 메세지를 보내지 못하도록 차단할까요? + %s 로부터 메세지를 받을 수 있도록 차단을 해제할까요? + %s 의 모든 연락처를 차단할까요? + %s 의 모든 연락처를 차단 해제할까요? + 연락처 차단됨 + %s 를 즐겨찾기에서 삭제할까요? 이 즐겨찾기와 연관된 대화는 삭제되지 않습니다. + 서버에서 새 계정을 등록 + 서버에서 비밀번호 변경 + 공유 + 대화 시작 + 연락처 초대 + 연락처 + 취소 + 설정 + 추가 + 편집 + 삭제 + 차단 + 차단 해제 + 저장 + 확인 + Conversations가 작동 중지되었습니다 + Stack trace 정보를 보냄으로서 Conversations의 개발에 기여할 수 있습니다. 경고: 이것은 Stack trace 정보를 개발자에게 보내기 위해 당신의 XMPP 계정을 사용할 것입니다. + 지금 보내기 + 더이상 묻지 않기 + 계정에 접속할 수 없습니다 + 다중 계정에 접속할 수 없습니다 + 여기를 선택해 당신의 계정을 관리하세요 + 파일 첨부 + 연락처가 당신의 명단에 없습니다. 추가하시겠습니까? + 연락처 추가 + 전송 실패 + 거부됨 + 이미지 전송 준비중 + 기록 삭제 + 대화 기록 삭제 + 이 대화의 모든 메세지를 삭제하시겠습니까? 경고: 이것은 다른 기기나 서버에 있는 메세지에는 영향을 미치지 않습니다. + 메세지 삭제 + 나중에 이 대화 끝내기 + 연락할 프레즌스 선택 + 평문 메세지 전송 + OTR 암호화된 메세지 전송 + OpenPGP 암호화된 메세지 전송 + 닉네임이 변경되었습니다 + 이미지 다운로드 + 암호화하지 않고 전송 + 복호화 실패. 올바른 개인 키를 가지고 있지 않은 것 같습니다. + OpenKeychain + Conversations는 메세지를 암호화 및 복호화하고 공개 키를 관리하기 위해 OpenKeychain이라는 제 3자 앱을 활용합니다. OpenKeychain은 GPLv3 라이센스를 사용하며 F-Droid와 Google Play에서 구하실 수 있습니다. (이후 Conversations를 재시작하세요) + 재시작 + 설치 + 제공중... + 대기중... + OpenPGP 키가 발견되지 않음 + 당신의 연락처가 그들의 공개 키를 선언하지 않고 있기 때문에 Conversations는 당신의 메세지를 암호화할 수 없습니다. OpenPGP를 설정하도록 당신의 연락처에게 물어보세요. + OpenPGP 키가 발견되지 않음 + 당신의 연락처가 그들의 공개 키를 선언하지 않고 있기 때문에 Conversations는 당신의 메세지를 암호화할 수 없습니다. OpenPGP를 설정하도록 당신의 연락처에게 물어보세요. + 암호화된 메세지 수신됨. 터치해서 복호화 및 열람하세요. + 일반 + XMPP 자원 + 이 클라이언트가 자신을 알아보는 이름 + 파일 수락 + 이 크기보다 작은 파일을 자동으로 수락 + 알림 설정 + 알림 + 새 메세지 도착시 알림 + 진동 + 새 메세지 도착시 진동 + 소리 + 알림과 동시에 벨소리 재생 + 회의 알림 + 새 회의 메세지가 도착시, 강조됐을 때 뿐만 아니라 항상 알림 + 알림 유예 + Carbon Copy 수신 후에 잠시동안 알림 해제 + 추가 설정 + 충돌 보고서 보내지 않음 + Stack trace 정보를 보냄으로서 Conversations의 개발에 기여할 수 있습니다 + 메세지 확인 + 메세지를 수신하고 읽었는지를 연락처에게 알려줌 + 사용자 환경 설정 + OpenKeychain이 오류를 보고합니다 + 파일 복호화 입출력 오류 + 수락 + 오류가 발생했습니다 + 프레즌스 업데이트 허가 + 당신이 추가한 연락처의 프레즌스 구독을 선제적으로 허가 및 요청함 + 구독 + 당신의 계정 + 키 + 프레즌스 업데이트 보내기 + 프레즌스 업데이트 받기 + 프레즌스 업데이트 요청 + 사진 선택 + 사진 찍기 + 구독 요청을 선제적으로 허가 + 선택한 파일은 이미지가 아닙니다 + 이미지 파일 변환 중 오류 발생 + 파일을 찾을 수 없음 + 일반 입출력 오류. 저장소 공간이 부족한 것 같습니다. + 이 이미지를 선택하기 위해 사용한 앱이 이 파일을 읽는데 필요한 충분한 허가를 제공하지 않았습니다. 다른 파일 탐색기를 이용해 이미지를 선택하세요. + 알 수 없음 + 임시로 해제 + 접속중 + 접속중\u2026 + 오프라인 + 승인되지 않음 + 서버를 찾을 수 없음 + 접속할 수 없음 + 등록 실패 + 사용자 이름이 이미 사용중입니다 + 등록 성공 + 서버가 등록을 지원하지 않습니다 + 보안 오류 + 호환되지 않는 서버 + 평문 + OTR + OpenPGP + 계정 편집 + 계정 삭제 + 임시로 해제 + 아바타 공개 + OpenPGP 공개 키 공개 + 계정 사용 + 확실합니까? + 계정을 삭제하면 당신의 모든 대화 기록이 사라집니다 + 녹음 + Jabber ID + 비밀번호 + username@example.com + 암호 확인 + 암호 + 암호 확인 + 암호가 일치하지 않습니다 + 올바른 Jabber ID가 아닙니다 + 메모리 부족. 이미지 용량이 너무 큽니다 + %s를 기기의 연락처 목록에 추가하시겠습니까? + 접속중 + 대화 가능 + 자리 비움 + 장기간 비움 + 방해 금지 + 오프라인 + 회의 + 다른 멤버 + 서버 정보 + XEP-0313: MAM + XEP-0280: Message Carbons + XEP-0352: Client State Indication + XEP-0191: Blocking Command + XEP-0237: Roster Versioning + XEP-0198: Stream Management + XEP-0163: PEP (Avatars) + 가능 + 불가 + 공개 키 선언 누락 + 방금 전까지 접속했었음 + 1분 전까지 접속했었음 + %d 분 전까지 접속했었음 + 1시간 전까지 접속했었음 + %d 시간 전까지 접속했었음 + 1일 전까지 접속했었음 + %d 일 전까지 접속했었음 + 접속한적 없음 + 암호화된 메세지. 복호화하기 위해 OpenKeychain을 설치하세요. + 알 수 없는 OTR 지문 + OpenPGP 암호화 메세지 발견 + 접수 실패 + 당신의 지문 + OTR 지문 + 검증 + 복호화 + 회의 + 검색 + 연락처 생성 + 회의 참석 + 연락처 삭제 + 연락처 정보 보기 + 연락처 차단 + 연락처 차단 해제 + 만들기 + 이미 존재하는 연락처입니다 + 참석 + 회의 주소 + room@conference.example.com + 즐겨찾기로 저장 + 즐겨찾기 삭제 + 즐겨찾기가 이미 존재합니다 + 당신 + 회의 제목 편집 + 회의를 찾을 수 없습니다 + 퇴장 + 연락처가 당신을 연락처 목록에 추가했습니다 + Add back + %s 가 여기까지 읽었습니다 + 공개 + 갤러리에서 사진을 선택하기 위해 아바타를 터치하세요 + 참고하세요: 당신의 프레즌스 업데이트를 구독한 모든 사람들은 이 사진을 볼 수 있습니다 + 공개중... + 서버가 당신의 발표를 거부했습니다 + 사진을 변환하는 중 오류가 발생했습니다 + 아바타를 저장할 수 없습니다 + (혹은 기본값을 되돌리기 위해 길게 누름) + 서버가 아바타 발표를 지원하지 않습니다 + 속삭임 + %s 에게 + %s 에게 개인 매세지 보내기 + 접속 + 계정이 이미 존재합니다 + 다음 + 현재 세션이 수립되었습니다 + 추가 정보 + 건너뛰기 + 알림 해제 + 이 대화의 알림 해제 + 알림이 해제되었습니다 + 사용 + 회의에 암호가 필요합니다 + 암호 입력 + 연락처로부터 프레즌스 업데이트 찾을 수 없음 + 먼저 연락처로부터 프레즌스 업데이트를 요청하세요. 이는 당신의 연락처가 어떤 클라이언트를 사용하는지 결정하는 데 사용됩니다. + 지금 요청 + 지문 삭제 + 이 지문을 삭제하시겠습니까? + 무시 + 경고: 상호간의 프레즌스 업데이트 없이 이것을 보내면 예기치 못한 문제를 발생시킬 수 있습니다. 당신의 프레즌스 구독을 검증하기 위해 연락처 상세 정보로 가세요. + 암호화 설정 + 강제적인 종단간 암호화 + 언제나 암호화 메세지로 전송 (회의 제외) + 암호화된 메세지 저장하지 않음 + 경고: 메세지가 손실될 수 있습니다 + 전문가 설정 + 설정시 주의하시기 바랍니다 + Conversations에 대해서 + 빌드 및 라이센스 정보 + 무음 시간대 + 시작 시간 + 마감 시간 + 무음 시간대 사용 + 무음 시간대에는 알림이 해제됩니다 + 글자 크기 증가 + 앱 전반에 큰 글자 크기를 사용합니다 + 전송 버튼이 상태를 나타냄 + 메세지 영수증 요청 + 만약 지원될 경우, 수신된 메세지는 초록색 기호로 표시됩니다. + 연락처 상태를 표시하기 위해 전송 버튼을 색칠함 + 기타 + 회의 이름 + 회의를 식별하기 위해 JID 대신 방 제목을 사용 + OTR 지문이 클립보드에 복사되었습니다 + 당신은 이 회의에서 금지되었습니다 + 이 회의는 멤버 전용입니다 + 당신은 이 회의에서 추방되었습니다 + using account %s + HTTP 호스트에서 이미지 확인중 + 이미지 파일이 삭제되었습니다 + 접속중이 아닙니다. 다시 시도하세요. + 이미지 파일 크기 확인 + 메세지 설정 + 텍스트 복사 + 원본 URL 복사 + 다시 보내기 + 이미지 URL + 메세지 텍스트 + URL이 클립보드에 복사되었습니다 + 메세지가 클립보드에 복사되었습니다 + 이미지 전송 실패 + QR코드 스캔 + QR코드 보기 + 차단 목록 보기 + 계정 정보 + OTR 검증 + Remote Fingerprint + 스캔 + (혹은 기기 터치) + Socialist Millionaire Protocol + 힌트 혹은 질문 + 공유된 비밀 + 확인 + 진행중 + 응답 + 실패 + 비밀이 일치하지 않습니다 + 다시 시도하세요 + 완료 + 검증 완료 + 연락처가 SMP 검증을 요구했습니다 + 올바른 OTR 세션이 발견되지 않았습니다 + Conversations + 포어그라운드에서 서비스 유지 + 운영체제가 접속을 해제하지 못하도록 예방합니다 + 파일 선택 + 수신중 %1$s (%2$d%% 완료) + %s 다운로드 + 파일 + %s 열기 + 전송중 (%1$d%% 완료) + 파일 전송 준비중 + %s 다운로드 제공됨 + 전송 취소 + 파일 전송 실패 + 파일이 삭제되었습니다 + 파일을 열기 위한 앱이 발견되지 않았습니다 + 지문을 검증할 수 없습니다 + 수동 검증 + 연락처의 OTR 지문을 검증하시겠습니까? + 동적 태그 표시 + 연락처 밑에 읽기 전용 태그 표시 + 알림 사용 + 회의 생성 + 회의 서버가 발견되지 않았습니다 + 회의 생성 실패 + 회의 생성됨 + 비밀 접수됨 + 초기화 + 계정 아바타 + OTR 지문을 클립보드에 복사 + 서버로부터 기록 가져오는중 + 서버에 더이상 기록이 없습니다 + 업데이트중... + 암호 변경됨 + 암호를 변경할 수 없습니다 + 암호화된 대화를 시작하기 위해 메세지 보내기 + 질문하기 + 만약 당신과 당신의 연락처가 다른 사람은 모르는 비밀을 공유하고 있다면, 그 비밀을 서로의 지문을 검증하는 데 사용할 수 있습니다. 대소문자가 구분된 대답을 할 연락처에게 힌트나 질문을 주세요. + 당신의 연락처는 당신의 지문을 검증하고자 공유된 비밀을 확인하려고 합니다. 당신의 연락처는 그 비밀에 관한 다음과 같은 힌트 혹은 질문을 제공했습니다. + 힌트를 반드시 입력해야 합니다 + 공유된 비밀을 반드시 입력해야 합니다 + 아래에 보이는 지문을 당신의 연락처의 지문과 세심하게 비교하세요. 당신은 암호화된 이메일이나 전화와 같은 믿을만한 통신수단으로 이것을 주고 받을 수 있습니다. + 암호 변경 + 현재 암호 + 새 암호 + 암호를 반드시 입력해야 합니다 + 모든 계정 사용 + 모든 계정 해제 + 다음으로 동작을 수행 + 관련 없음 + 역할 없음 + 추방됨 + 멤버 + 고급 모드 + 멤버십 허가 + 멤버십 철회 + 관리자 특권 허가 + 관리자 특권 철회 + 회의에서 제거 + %s 의 관련 여부를 변경할 수 없습니다 + 회의에서 금지 + %s 를 공개 회의에서 제거하려고 하고 있습니다. 유일한 방법은 이 사용자를 앞으로 금지시키는 것입니다. + 지금 금지 + %s 의 역할을 변경할 수 없습니다 + 공개적으로 접근 가능한 회의 + 멤버 전용 사설 회의 + 회의 설정 + 사설 (멤버 전용) + 익명 아님 + 회의 설정 변경됨 + 회의 설정을 변경할 수 없습니다 + 안함 + 30분 + 1시간 + 2시간 + 8시간 + 나중에 알릴때까지 + 입력 설정 + 엔터 키로 전송 + 엔터 키로 메세지를 보냅니다 + 엔터 키 표시 + 이모티콘 키를 엔터 키로 바꿉니다 + 오디오 + 비디오 + 이미지 + PDF 문서 + 안드로이드 앱 + 연락처 + %s 수신 + 포어그라운드 서비스 해제 + 터치해서 Conversations 열기 + 아바타가 공개되었습니다 + %s 전송중 + %s 제공중 + 오프라인 숨기기 + 계정 해제 + %s 이(가) 입력중입니다... + %s 이(가) 입력을 중단했습니다 + 입력 알림 + 새 메세지를 작성할 때 이를 연락처에게 알립니다 + 위치 전송 + 위치 표시 + 위치를 표시할 수 있는 앱이 발견되지 않았습니다 + 위치 + 위치 수신 + 대화 끝남 + 회의에서 나감 + 인증 설정 + 시스템 CA를 신뢰하지 않음 + 모든 인증서는 수동으로 승인되어야 함 + 인증서 삭제 + 수동으로 승인된 인증서 삭제 + 수동으로 승인된 인증서 없음 + 인증서 삭제 + 선택 삭제 + 취소 + + %d 인증서 삭제됨 + + + %d 연락처 선택 + + diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index 650e18c4..2532130d 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -429,8 +429,19 @@ Locatie ontvangen Gesprek gesloten Groepsgesprek verlaten + Certificaatopties Vertrouw geen systeem-CA\'s. Alle certificaten moeten handmatig goedgekeurd worden + Verwijder certificaten + Verwijder handmatig goedgekeurde certificaten + Geen handmatig goedgekeurde certificaten + Verwijder certificaten + Verwijder selectie + Annuleer + + %d certificaat verwijderd + %d certificaten verwijderd + Selecteer %d contact Selecteer %d contacten diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index b411f484..4f84110b 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -429,8 +429,19 @@ Mottog position Konversation stängd Lämnade konferens + Certifikatalternativ Lita inte på systemets CAs Alla certifikat måste manuellt godkännas + Ta bort certifikat + Ta bort manuellt accepterade certifikat + Inga manuellt accepterade certifikat + Ta bort certifikat + Ta bort val + Avbryt + + %d certifikat borttaget + %d certifikat borttagna + Välj %d kontakt Välj %d kontakter -- cgit v1.2.3 From e1fab8a488ea99271f1920056f58c779bf300bdf Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 1 May 2015 13:52:19 +0200 Subject: pulled translations from transifex --- src/main/res/values-el/strings.xml | 11 +++++++ src/main/res/values-ru/strings.xml | 59 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) (limited to 'src/main/res') diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index ec1da08c..01b33908 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -429,8 +429,19 @@ Ελήφθη τοποθεσία Η συζήτηση έκλεισε Έφυγε από την συνδιάσκεψη + Επιλογές πιστοποιητικών Μη έμπιστες αρχές πιστοποίησης συστήματος Όλα τα πιστοποιητικά πρέπει να εγκριθούν χειροκίνητα + Αφαίρεση πιστοποιητικών + Διαγραφή με μη αυτόματο τρόπο των αναγνωρισμένων πιστοποιητικών + Δεν υπάρχουν με μη αυτόματο τρόπο αναγνωρισμένα πιστοποιητικα + Αφαίρεση πιστοποιητικών + Διαγραφή επιλογής + Ακύρωση + + %d πιστοποιητικο διαγραφθηκε + %d πιστοποιητικά διαγραφθηκαν + Επιλογή %d επαφής Επιλογή %d επαφών diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index fb39e24a..2fc257f7 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -389,4 +389,63 @@ Публичная конференция Приватная конференция только для членов Настройки конференции + Закрытый доступ (только для участников) + Не анонимно + Настройки конференции изменены! + Не удалось изменить настройки конференции + Никогда + 30 минут + 1 час + 2 часа + 8 часов + До следующего уведомления + Настройки ввода + Отправить на \"Enter\" + Клавиша \"Enter\" отправляет сообщение + Показывать клавишу ввода + Поменять кнопку смайликов на кнопку ввода + аудио + звук + изображение + PDF-документ + Приложение Android + Контакт + Получено %s + Отключить фоновую службу + Коснитесь, чтобы открыть Conversations + Аватар загружен! + Отправляется %s + Предложен %s + Скрыть пользователей вне сети + Отключить учётную запись + %s набирает сообщение... + %s прекратил набор + Оповещения о наборе + Позволяет вашим контактам видеть когда вы пишете новое сообщение + Отправить местоположение + Показать местоположение + Не найдено приложений для отображения местоположения + Местоположение + Получено местоположение + Беседа окончена + Покинул беседу + Опции сертификата + Не доверять системным УЦ + Все сертификаты должны быть подтверждены вручную + Удалить сертификат + Удалить сертификаты, подтверждённые вручную + Не найдено сертификатов, подтверждённых вручную + Удалить сертификаты + Удалить отмеченное + Отмена + + Удалён %d сертификат + Удалено %d сертификатов + Удалено %d сертификатов + + + Выбран %d контакт + Выбрано %d контактов + Выбрано %d контактов + -- cgit v1.2.3 From 53fea9e1fe25a1f0f2a7fe219195b0009ecb4f5b Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 2 May 2015 11:38:56 +0200 Subject: replace send button with quick action button as long as no text has been entered --- .../res/drawable-hdpi/ic_action_send_now_away.png | Bin 932 -> 0 bytes .../res/drawable-hdpi/ic_action_send_now_dnd.png | Bin 1135 -> 0 bytes .../drawable-hdpi/ic_action_send_now_offline.png | Bin 767 -> 0 bytes .../drawable-hdpi/ic_action_send_now_online.png | Bin 1095 -> 0 bytes src/main/res/drawable-hdpi/ic_launcher.png | Bin 4497 -> 4486 bytes src/main/res/drawable-hdpi/ic_notification.png | Bin 806 -> 798 bytes .../res/drawable-hdpi/ic_received_indicator.png | Bin 686 -> 560 bytes .../res/drawable-hdpi/ic_send_location_away.png | Bin 0 -> 1159 bytes .../res/drawable-hdpi/ic_send_location_dnd.png | Bin 0 -> 1333 bytes .../res/drawable-hdpi/ic_send_location_offline.png | Bin 0 -> 971 bytes .../res/drawable-hdpi/ic_send_location_online.png | Bin 0 -> 1341 bytes src/main/res/drawable-hdpi/ic_send_photo_away.png | Bin 0 -> 1203 bytes src/main/res/drawable-hdpi/ic_send_photo_dnd.png | Bin 0 -> 1381 bytes .../res/drawable-hdpi/ic_send_photo_offline.png | Bin 0 -> 987 bytes .../res/drawable-hdpi/ic_send_photo_online.png | Bin 0 -> 1400 bytes src/main/res/drawable-hdpi/ic_send_text_away.png | Bin 0 -> 982 bytes src/main/res/drawable-hdpi/ic_send_text_dnd.png | Bin 0 -> 1126 bytes .../res/drawable-hdpi/ic_send_text_offline.png | Bin 0 -> 800 bytes src/main/res/drawable-hdpi/ic_send_text_online.png | Bin 0 -> 1143 bytes src/main/res/drawable-hdpi/ic_send_voice_away.png | Bin 0 -> 1017 bytes src/main/res/drawable-hdpi/ic_send_voice_dnd.png | Bin 0 -> 1149 bytes .../res/drawable-hdpi/ic_send_voice_offline.png | Bin 0 -> 844 bytes .../res/drawable-hdpi/ic_send_voice_online.png | Bin 0 -> 1162 bytes .../res/drawable-mdpi/ic_action_send_now_away.png | Bin 650 -> 0 bytes .../res/drawable-mdpi/ic_action_send_now_dnd.png | Bin 784 -> 0 bytes .../drawable-mdpi/ic_action_send_now_offline.png | Bin 535 -> 0 bytes .../drawable-mdpi/ic_action_send_now_online.png | Bin 779 -> 0 bytes src/main/res/drawable-mdpi/ic_launcher.png | Bin 2741 -> 2762 bytes src/main/res/drawable-mdpi/ic_notification.png | Bin 553 -> 554 bytes .../res/drawable-mdpi/ic_received_indicator.png | Bin 447 -> 402 bytes .../res/drawable-mdpi/ic_send_location_away.png | Bin 0 -> 784 bytes .../res/drawable-mdpi/ic_send_location_dnd.png | Bin 0 -> 908 bytes .../res/drawable-mdpi/ic_send_location_offline.png | Bin 0 -> 673 bytes .../res/drawable-mdpi/ic_send_location_online.png | Bin 0 -> 919 bytes src/main/res/drawable-mdpi/ic_send_photo_away.png | Bin 0 -> 776 bytes src/main/res/drawable-mdpi/ic_send_photo_dnd.png | Bin 0 -> 909 bytes .../res/drawable-mdpi/ic_send_photo_offline.png | Bin 0 -> 666 bytes .../res/drawable-mdpi/ic_send_photo_online.png | Bin 0 -> 938 bytes src/main/res/drawable-mdpi/ic_send_text_away.png | Bin 0 -> 677 bytes src/main/res/drawable-mdpi/ic_send_text_dnd.png | Bin 0 -> 769 bytes .../res/drawable-mdpi/ic_send_text_offline.png | Bin 0 -> 542 bytes src/main/res/drawable-mdpi/ic_send_text_online.png | Bin 0 -> 793 bytes src/main/res/drawable-mdpi/ic_send_voice_away.png | Bin 0 -> 679 bytes src/main/res/drawable-mdpi/ic_send_voice_dnd.png | Bin 0 -> 774 bytes .../res/drawable-mdpi/ic_send_voice_offline.png | Bin 0 -> 575 bytes .../res/drawable-mdpi/ic_send_voice_online.png | Bin 0 -> 788 bytes .../res/drawable-xhdpi/ic_action_send_now_away.png | Bin 1180 -> 0 bytes .../res/drawable-xhdpi/ic_action_send_now_dnd.png | Bin 1438 -> 0 bytes .../drawable-xhdpi/ic_action_send_now_offline.png | Bin 968 -> 0 bytes .../drawable-xhdpi/ic_action_send_now_online.png | Bin 1395 -> 0 bytes src/main/res/drawable-xhdpi/ic_launcher.png | Bin 6336 -> 6377 bytes src/main/res/drawable-xhdpi/ic_notification.png | Bin 1079 -> 1075 bytes .../res/drawable-xhdpi/ic_received_indicator.png | Bin 855 -> 717 bytes .../res/drawable-xhdpi/ic_send_location_away.png | Bin 0 -> 1507 bytes .../res/drawable-xhdpi/ic_send_location_dnd.png | Bin 0 -> 1721 bytes .../drawable-xhdpi/ic_send_location_offline.png | Bin 0 -> 1278 bytes .../res/drawable-xhdpi/ic_send_location_online.png | Bin 0 -> 1751 bytes src/main/res/drawable-xhdpi/ic_send_photo_away.png | Bin 0 -> 1516 bytes src/main/res/drawable-xhdpi/ic_send_photo_dnd.png | Bin 0 -> 1723 bytes .../res/drawable-xhdpi/ic_send_photo_offline.png | Bin 0 -> 1247 bytes .../res/drawable-xhdpi/ic_send_photo_online.png | Bin 0 -> 1755 bytes src/main/res/drawable-xhdpi/ic_send_text_away.png | Bin 0 -> 1270 bytes src/main/res/drawable-xhdpi/ic_send_text_dnd.png | Bin 0 -> 1395 bytes .../res/drawable-xhdpi/ic_send_text_offline.png | Bin 0 -> 1007 bytes .../res/drawable-xhdpi/ic_send_text_online.png | Bin 0 -> 1468 bytes src/main/res/drawable-xhdpi/ic_send_voice_away.png | Bin 0 -> 1257 bytes src/main/res/drawable-xhdpi/ic_send_voice_dnd.png | Bin 0 -> 1426 bytes .../res/drawable-xhdpi/ic_send_voice_offline.png | Bin 0 -> 1075 bytes .../res/drawable-xhdpi/ic_send_voice_online.png | Bin 0 -> 1433 bytes .../drawable-xxhdpi/ic_action_send_now_away.png | Bin 1426 -> 0 bytes .../res/drawable-xxhdpi/ic_action_send_now_dnd.png | Bin 1456 -> 0 bytes .../drawable-xxhdpi/ic_action_send_now_offline.png | Bin 1433 -> 0 bytes .../drawable-xxhdpi/ic_action_send_now_online.png | Bin 1458 -> 0 bytes src/main/res/drawable-xxhdpi/ic_launcher.png | Bin 10221 -> 10254 bytes src/main/res/drawable-xxhdpi/ic_notification.png | Bin 1573 -> 1618 bytes .../res/drawable-xxhdpi/ic_received_indicator.png | Bin 1236 -> 1016 bytes .../res/drawable-xxhdpi/ic_send_location_away.png | Bin 0 -> 2229 bytes .../res/drawable-xxhdpi/ic_send_location_dnd.png | Bin 0 -> 2578 bytes .../drawable-xxhdpi/ic_send_location_offline.png | Bin 0 -> 1881 bytes .../drawable-xxhdpi/ic_send_location_online.png | Bin 0 -> 2605 bytes .../res/drawable-xxhdpi/ic_send_photo_away.png | Bin 0 -> 2256 bytes src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png | Bin 0 -> 2588 bytes .../res/drawable-xxhdpi/ic_send_photo_offline.png | Bin 0 -> 1802 bytes .../res/drawable-xxhdpi/ic_send_photo_online.png | Bin 0 -> 2571 bytes src/main/res/drawable-xxhdpi/ic_send_text_away.png | Bin 0 -> 1776 bytes src/main/res/drawable-xxhdpi/ic_send_text_dnd.png | Bin 0 -> 2004 bytes .../res/drawable-xxhdpi/ic_send_text_offline.png | Bin 0 -> 1410 bytes .../res/drawable-xxhdpi/ic_send_text_online.png | Bin 0 -> 2001 bytes .../res/drawable-xxhdpi/ic_send_voice_away.png | Bin 0 -> 1895 bytes src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png | Bin 0 -> 2152 bytes .../res/drawable-xxhdpi/ic_send_voice_offline.png | Bin 0 -> 1621 bytes .../res/drawable-xxhdpi/ic_send_voice_online.png | Bin 0 -> 2183 bytes src/main/res/drawable-xxxhdpi/ic_launcher.png | Bin 14234 -> 14117 bytes src/main/res/drawable-xxxhdpi/ic_notification.png | Bin 2063 -> 2117 bytes .../res/drawable-xxxhdpi/ic_received_indicator.png | Bin 1608 -> 1303 bytes .../res/drawable-xxxhdpi/ic_send_location_away.png | Bin 0 -> 3015 bytes .../res/drawable-xxxhdpi/ic_send_location_dnd.png | Bin 0 -> 3456 bytes .../drawable-xxxhdpi/ic_send_location_offline.png | Bin 0 -> 2523 bytes .../drawable-xxxhdpi/ic_send_location_online.png | Bin 0 -> 3514 bytes .../res/drawable-xxxhdpi/ic_send_photo_away.png | Bin 0 -> 3040 bytes .../res/drawable-xxxhdpi/ic_send_photo_dnd.png | Bin 0 -> 3544 bytes .../res/drawable-xxxhdpi/ic_send_photo_offline.png | Bin 0 -> 2491 bytes .../res/drawable-xxxhdpi/ic_send_photo_online.png | Bin 0 -> 3566 bytes .../res/drawable-xxxhdpi/ic_send_text_away.png | Bin 0 -> 2311 bytes src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png | Bin 0 -> 2597 bytes .../res/drawable-xxxhdpi/ic_send_text_offline.png | Bin 0 -> 1862 bytes .../res/drawable-xxxhdpi/ic_send_text_online.png | Bin 0 -> 2708 bytes .../res/drawable-xxxhdpi/ic_send_voice_away.png | Bin 0 -> 2491 bytes .../res/drawable-xxxhdpi/ic_send_voice_dnd.png | Bin 0 -> 2811 bytes .../res/drawable-xxxhdpi/ic_send_voice_offline.png | Bin 0 -> 2092 bytes .../res/drawable-xxxhdpi/ic_send_voice_online.png | Bin 0 -> 2868 bytes src/main/res/layout/fragment_conversation.xml | 2 +- src/main/res/values/arrays.xml | 15 + src/main/res/values/strings.xml | 813 +++++++++++---------- src/main/res/xml/preferences.xml | 8 + 115 files changed, 433 insertions(+), 405 deletions(-) delete mode 100644 src/main/res/drawable-hdpi/ic_action_send_now_away.png delete mode 100644 src/main/res/drawable-hdpi/ic_action_send_now_dnd.png delete mode 100644 src/main/res/drawable-hdpi/ic_action_send_now_offline.png delete mode 100644 src/main/res/drawable-hdpi/ic_action_send_now_online.png create mode 100644 src/main/res/drawable-hdpi/ic_send_location_away.png create mode 100644 src/main/res/drawable-hdpi/ic_send_location_dnd.png create mode 100644 src/main/res/drawable-hdpi/ic_send_location_offline.png create mode 100644 src/main/res/drawable-hdpi/ic_send_location_online.png create mode 100644 src/main/res/drawable-hdpi/ic_send_photo_away.png create mode 100644 src/main/res/drawable-hdpi/ic_send_photo_dnd.png create mode 100644 src/main/res/drawable-hdpi/ic_send_photo_offline.png create mode 100644 src/main/res/drawable-hdpi/ic_send_photo_online.png create mode 100644 src/main/res/drawable-hdpi/ic_send_text_away.png create mode 100644 src/main/res/drawable-hdpi/ic_send_text_dnd.png create mode 100644 src/main/res/drawable-hdpi/ic_send_text_offline.png create mode 100644 src/main/res/drawable-hdpi/ic_send_text_online.png create mode 100644 src/main/res/drawable-hdpi/ic_send_voice_away.png create mode 100644 src/main/res/drawable-hdpi/ic_send_voice_dnd.png create mode 100644 src/main/res/drawable-hdpi/ic_send_voice_offline.png create mode 100644 src/main/res/drawable-hdpi/ic_send_voice_online.png delete mode 100644 src/main/res/drawable-mdpi/ic_action_send_now_away.png delete mode 100644 src/main/res/drawable-mdpi/ic_action_send_now_dnd.png delete mode 100644 src/main/res/drawable-mdpi/ic_action_send_now_offline.png delete mode 100644 src/main/res/drawable-mdpi/ic_action_send_now_online.png create mode 100644 src/main/res/drawable-mdpi/ic_send_location_away.png create mode 100644 src/main/res/drawable-mdpi/ic_send_location_dnd.png create mode 100644 src/main/res/drawable-mdpi/ic_send_location_offline.png create mode 100644 src/main/res/drawable-mdpi/ic_send_location_online.png create mode 100644 src/main/res/drawable-mdpi/ic_send_photo_away.png create mode 100644 src/main/res/drawable-mdpi/ic_send_photo_dnd.png create mode 100644 src/main/res/drawable-mdpi/ic_send_photo_offline.png create mode 100644 src/main/res/drawable-mdpi/ic_send_photo_online.png create mode 100644 src/main/res/drawable-mdpi/ic_send_text_away.png create mode 100644 src/main/res/drawable-mdpi/ic_send_text_dnd.png create mode 100644 src/main/res/drawable-mdpi/ic_send_text_offline.png create mode 100644 src/main/res/drawable-mdpi/ic_send_text_online.png create mode 100644 src/main/res/drawable-mdpi/ic_send_voice_away.png create mode 100644 src/main/res/drawable-mdpi/ic_send_voice_dnd.png create mode 100644 src/main/res/drawable-mdpi/ic_send_voice_offline.png create mode 100644 src/main/res/drawable-mdpi/ic_send_voice_online.png delete mode 100644 src/main/res/drawable-xhdpi/ic_action_send_now_away.png delete mode 100644 src/main/res/drawable-xhdpi/ic_action_send_now_dnd.png delete mode 100644 src/main/res/drawable-xhdpi/ic_action_send_now_offline.png delete mode 100644 src/main/res/drawable-xhdpi/ic_action_send_now_online.png create mode 100644 src/main/res/drawable-xhdpi/ic_send_location_away.png create mode 100644 src/main/res/drawable-xhdpi/ic_send_location_dnd.png create mode 100644 src/main/res/drawable-xhdpi/ic_send_location_offline.png create mode 100644 src/main/res/drawable-xhdpi/ic_send_location_online.png create mode 100644 src/main/res/drawable-xhdpi/ic_send_photo_away.png create mode 100644 src/main/res/drawable-xhdpi/ic_send_photo_dnd.png create mode 100644 src/main/res/drawable-xhdpi/ic_send_photo_offline.png create mode 100644 src/main/res/drawable-xhdpi/ic_send_photo_online.png create mode 100644 src/main/res/drawable-xhdpi/ic_send_text_away.png create mode 100644 src/main/res/drawable-xhdpi/ic_send_text_dnd.png create mode 100644 src/main/res/drawable-xhdpi/ic_send_text_offline.png create mode 100644 src/main/res/drawable-xhdpi/ic_send_text_online.png create mode 100644 src/main/res/drawable-xhdpi/ic_send_voice_away.png create mode 100644 src/main/res/drawable-xhdpi/ic_send_voice_dnd.png create mode 100644 src/main/res/drawable-xhdpi/ic_send_voice_offline.png create mode 100644 src/main/res/drawable-xhdpi/ic_send_voice_online.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_action_send_now_away.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_action_send_now_dnd.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_action_send_now_offline.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_action_send_now_online.png create mode 100644 src/main/res/drawable-xxhdpi/ic_send_location_away.png create mode 100644 src/main/res/drawable-xxhdpi/ic_send_location_dnd.png create mode 100644 src/main/res/drawable-xxhdpi/ic_send_location_offline.png create mode 100644 src/main/res/drawable-xxhdpi/ic_send_location_online.png create mode 100644 src/main/res/drawable-xxhdpi/ic_send_photo_away.png create mode 100644 src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png create mode 100644 src/main/res/drawable-xxhdpi/ic_send_photo_offline.png create mode 100644 src/main/res/drawable-xxhdpi/ic_send_photo_online.png create mode 100644 src/main/res/drawable-xxhdpi/ic_send_text_away.png create mode 100644 src/main/res/drawable-xxhdpi/ic_send_text_dnd.png create mode 100644 src/main/res/drawable-xxhdpi/ic_send_text_offline.png create mode 100644 src/main/res/drawable-xxhdpi/ic_send_text_online.png create mode 100644 src/main/res/drawable-xxhdpi/ic_send_voice_away.png create mode 100644 src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png create mode 100644 src/main/res/drawable-xxhdpi/ic_send_voice_offline.png create mode 100644 src/main/res/drawable-xxhdpi/ic_send_voice_online.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_send_location_away.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_send_location_dnd.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_send_location_offline.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_send_location_online.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_send_photo_away.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_send_photo_offline.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_send_photo_online.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_send_text_away.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_send_text_offline.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_send_text_online.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_send_voice_away.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_send_voice_offline.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_send_voice_online.png (limited to 'src/main/res') diff --git a/src/main/res/drawable-hdpi/ic_action_send_now_away.png b/src/main/res/drawable-hdpi/ic_action_send_now_away.png deleted file mode 100644 index 505cbe63..00000000 Binary files a/src/main/res/drawable-hdpi/ic_action_send_now_away.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_action_send_now_dnd.png b/src/main/res/drawable-hdpi/ic_action_send_now_dnd.png deleted file mode 100644 index a376524d..00000000 Binary files a/src/main/res/drawable-hdpi/ic_action_send_now_dnd.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_action_send_now_offline.png b/src/main/res/drawable-hdpi/ic_action_send_now_offline.png deleted file mode 100644 index d4d2d510..00000000 Binary files a/src/main/res/drawable-hdpi/ic_action_send_now_offline.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_action_send_now_online.png b/src/main/res/drawable-hdpi/ic_action_send_now_online.png deleted file mode 100644 index 48676f7b..00000000 Binary files a/src/main/res/drawable-hdpi/ic_action_send_now_online.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_launcher.png b/src/main/res/drawable-hdpi/ic_launcher.png index bffc1c65..25fc8591 100644 Binary files a/src/main/res/drawable-hdpi/ic_launcher.png and b/src/main/res/drawable-hdpi/ic_launcher.png differ diff --git a/src/main/res/drawable-hdpi/ic_notification.png b/src/main/res/drawable-hdpi/ic_notification.png index c466a7b1..31c0ee1a 100644 Binary files a/src/main/res/drawable-hdpi/ic_notification.png and b/src/main/res/drawable-hdpi/ic_notification.png differ diff --git a/src/main/res/drawable-hdpi/ic_received_indicator.png b/src/main/res/drawable-hdpi/ic_received_indicator.png index b1e3f274..4d2eab56 100644 Binary files a/src/main/res/drawable-hdpi/ic_received_indicator.png and b/src/main/res/drawable-hdpi/ic_received_indicator.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_location_away.png b/src/main/res/drawable-hdpi/ic_send_location_away.png new file mode 100644 index 00000000..d139818b Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_location_away.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_location_dnd.png b/src/main/res/drawable-hdpi/ic_send_location_dnd.png new file mode 100644 index 00000000..3bcbe18a Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_location_dnd.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_location_offline.png b/src/main/res/drawable-hdpi/ic_send_location_offline.png new file mode 100644 index 00000000..4aec18af Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_location_offline.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_location_online.png b/src/main/res/drawable-hdpi/ic_send_location_online.png new file mode 100644 index 00000000..19ddc51e Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_location_online.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_photo_away.png b/src/main/res/drawable-hdpi/ic_send_photo_away.png new file mode 100644 index 00000000..f6beb23c Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_photo_away.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_photo_dnd.png b/src/main/res/drawable-hdpi/ic_send_photo_dnd.png new file mode 100644 index 00000000..2eb85679 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_photo_dnd.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_photo_offline.png b/src/main/res/drawable-hdpi/ic_send_photo_offline.png new file mode 100644 index 00000000..046f989b Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_photo_offline.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_photo_online.png b/src/main/res/drawable-hdpi/ic_send_photo_online.png new file mode 100644 index 00000000..3fd20d10 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_photo_online.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_text_away.png b/src/main/res/drawable-hdpi/ic_send_text_away.png new file mode 100644 index 00000000..d9ef99c5 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_text_away.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_text_dnd.png b/src/main/res/drawable-hdpi/ic_send_text_dnd.png new file mode 100644 index 00000000..706b6505 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_text_dnd.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_text_offline.png b/src/main/res/drawable-hdpi/ic_send_text_offline.png new file mode 100644 index 00000000..0f23fdbb Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_text_offline.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_text_online.png b/src/main/res/drawable-hdpi/ic_send_text_online.png new file mode 100644 index 00000000..305f1ec2 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_text_online.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_voice_away.png b/src/main/res/drawable-hdpi/ic_send_voice_away.png new file mode 100644 index 00000000..e87d9751 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_voice_away.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_voice_dnd.png b/src/main/res/drawable-hdpi/ic_send_voice_dnd.png new file mode 100644 index 00000000..50184ee8 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_voice_dnd.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_voice_offline.png b/src/main/res/drawable-hdpi/ic_send_voice_offline.png new file mode 100644 index 00000000..68ce48b8 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_voice_offline.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_voice_online.png b/src/main/res/drawable-hdpi/ic_send_voice_online.png new file mode 100644 index 00000000..bfd7dfa7 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_voice_online.png differ diff --git a/src/main/res/drawable-mdpi/ic_action_send_now_away.png b/src/main/res/drawable-mdpi/ic_action_send_now_away.png deleted file mode 100644 index 0fdca901..00000000 Binary files a/src/main/res/drawable-mdpi/ic_action_send_now_away.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_action_send_now_dnd.png b/src/main/res/drawable-mdpi/ic_action_send_now_dnd.png deleted file mode 100644 index c0aef36c..00000000 Binary files a/src/main/res/drawable-mdpi/ic_action_send_now_dnd.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_action_send_now_offline.png b/src/main/res/drawable-mdpi/ic_action_send_now_offline.png deleted file mode 100644 index 7723f4aa..00000000 Binary files a/src/main/res/drawable-mdpi/ic_action_send_now_offline.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_action_send_now_online.png b/src/main/res/drawable-mdpi/ic_action_send_now_online.png deleted file mode 100644 index 39d00ee4..00000000 Binary files a/src/main/res/drawable-mdpi/ic_action_send_now_online.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_launcher.png b/src/main/res/drawable-mdpi/ic_launcher.png index 063ee15d..733e9615 100644 Binary files a/src/main/res/drawable-mdpi/ic_launcher.png and b/src/main/res/drawable-mdpi/ic_launcher.png differ diff --git a/src/main/res/drawable-mdpi/ic_notification.png b/src/main/res/drawable-mdpi/ic_notification.png index fa35b7c1..aafc54f5 100644 Binary files a/src/main/res/drawable-mdpi/ic_notification.png and b/src/main/res/drawable-mdpi/ic_notification.png differ diff --git a/src/main/res/drawable-mdpi/ic_received_indicator.png b/src/main/res/drawable-mdpi/ic_received_indicator.png index 88ff1efb..2ba92b69 100644 Binary files a/src/main/res/drawable-mdpi/ic_received_indicator.png and b/src/main/res/drawable-mdpi/ic_received_indicator.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_location_away.png b/src/main/res/drawable-mdpi/ic_send_location_away.png new file mode 100644 index 00000000..821e80d2 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_location_away.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_location_dnd.png b/src/main/res/drawable-mdpi/ic_send_location_dnd.png new file mode 100644 index 00000000..92e68ee3 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_location_dnd.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_location_offline.png b/src/main/res/drawable-mdpi/ic_send_location_offline.png new file mode 100644 index 00000000..ff11a080 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_location_offline.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_location_online.png b/src/main/res/drawable-mdpi/ic_send_location_online.png new file mode 100644 index 00000000..a0eb4018 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_location_online.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_photo_away.png b/src/main/res/drawable-mdpi/ic_send_photo_away.png new file mode 100644 index 00000000..d9c1f266 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_photo_away.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_photo_dnd.png b/src/main/res/drawable-mdpi/ic_send_photo_dnd.png new file mode 100644 index 00000000..7b6700d6 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_photo_dnd.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_photo_offline.png b/src/main/res/drawable-mdpi/ic_send_photo_offline.png new file mode 100644 index 00000000..f3e6e1fa Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_photo_offline.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_photo_online.png b/src/main/res/drawable-mdpi/ic_send_photo_online.png new file mode 100644 index 00000000..0aaab38d Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_photo_online.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_text_away.png b/src/main/res/drawable-mdpi/ic_send_text_away.png new file mode 100644 index 00000000..ddd983b5 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_text_away.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_text_dnd.png b/src/main/res/drawable-mdpi/ic_send_text_dnd.png new file mode 100644 index 00000000..92df9d3d Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_text_dnd.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_text_offline.png b/src/main/res/drawable-mdpi/ic_send_text_offline.png new file mode 100644 index 00000000..72b9da27 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_text_offline.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_text_online.png b/src/main/res/drawable-mdpi/ic_send_text_online.png new file mode 100644 index 00000000..86d1e330 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_text_online.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_voice_away.png b/src/main/res/drawable-mdpi/ic_send_voice_away.png new file mode 100644 index 00000000..943f690f Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_voice_away.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_voice_dnd.png b/src/main/res/drawable-mdpi/ic_send_voice_dnd.png new file mode 100644 index 00000000..ef25b1c4 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_voice_dnd.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_voice_offline.png b/src/main/res/drawable-mdpi/ic_send_voice_offline.png new file mode 100644 index 00000000..e6b2355f Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_voice_offline.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_voice_online.png b/src/main/res/drawable-mdpi/ic_send_voice_online.png new file mode 100644 index 00000000..bd0e1f87 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_voice_online.png differ diff --git a/src/main/res/drawable-xhdpi/ic_action_send_now_away.png b/src/main/res/drawable-xhdpi/ic_action_send_now_away.png deleted file mode 100644 index bb999d85..00000000 Binary files a/src/main/res/drawable-xhdpi/ic_action_send_now_away.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_action_send_now_dnd.png b/src/main/res/drawable-xhdpi/ic_action_send_now_dnd.png deleted file mode 100644 index a0bf5561..00000000 Binary files a/src/main/res/drawable-xhdpi/ic_action_send_now_dnd.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_action_send_now_offline.png b/src/main/res/drawable-xhdpi/ic_action_send_now_offline.png deleted file mode 100644 index 6da9ff7b..00000000 Binary files a/src/main/res/drawable-xhdpi/ic_action_send_now_offline.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_action_send_now_online.png b/src/main/res/drawable-xhdpi/ic_action_send_now_online.png deleted file mode 100644 index 348ba657..00000000 Binary files a/src/main/res/drawable-xhdpi/ic_action_send_now_online.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_launcher.png b/src/main/res/drawable-xhdpi/ic_launcher.png index fd9937f1..c9e48859 100644 Binary files a/src/main/res/drawable-xhdpi/ic_launcher.png and b/src/main/res/drawable-xhdpi/ic_launcher.png differ diff --git a/src/main/res/drawable-xhdpi/ic_notification.png b/src/main/res/drawable-xhdpi/ic_notification.png index 43daff65..042d2cda 100644 Binary files a/src/main/res/drawable-xhdpi/ic_notification.png and b/src/main/res/drawable-xhdpi/ic_notification.png differ diff --git a/src/main/res/drawable-xhdpi/ic_received_indicator.png b/src/main/res/drawable-xhdpi/ic_received_indicator.png index 2c871933..cf7c2bb8 100644 Binary files a/src/main/res/drawable-xhdpi/ic_received_indicator.png and b/src/main/res/drawable-xhdpi/ic_received_indicator.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_location_away.png b/src/main/res/drawable-xhdpi/ic_send_location_away.png new file mode 100644 index 00000000..0a5f3d54 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_location_away.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_location_dnd.png b/src/main/res/drawable-xhdpi/ic_send_location_dnd.png new file mode 100644 index 00000000..90ce346c Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_location_dnd.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_location_offline.png b/src/main/res/drawable-xhdpi/ic_send_location_offline.png new file mode 100644 index 00000000..114ce01b Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_location_offline.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_location_online.png b/src/main/res/drawable-xhdpi/ic_send_location_online.png new file mode 100644 index 00000000..17204eea Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_location_online.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_photo_away.png b/src/main/res/drawable-xhdpi/ic_send_photo_away.png new file mode 100644 index 00000000..7ac674ea Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_photo_away.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_photo_dnd.png b/src/main/res/drawable-xhdpi/ic_send_photo_dnd.png new file mode 100644 index 00000000..2c37db74 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_photo_dnd.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_photo_offline.png b/src/main/res/drawable-xhdpi/ic_send_photo_offline.png new file mode 100644 index 00000000..6ef1e16a Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_photo_offline.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_photo_online.png b/src/main/res/drawable-xhdpi/ic_send_photo_online.png new file mode 100644 index 00000000..f585ef98 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_photo_online.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_text_away.png b/src/main/res/drawable-xhdpi/ic_send_text_away.png new file mode 100644 index 00000000..41f223f6 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_text_away.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_text_dnd.png b/src/main/res/drawable-xhdpi/ic_send_text_dnd.png new file mode 100644 index 00000000..0a749f8d Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_text_dnd.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_text_offline.png b/src/main/res/drawable-xhdpi/ic_send_text_offline.png new file mode 100644 index 00000000..d0a98e5d Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_text_offline.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_text_online.png b/src/main/res/drawable-xhdpi/ic_send_text_online.png new file mode 100644 index 00000000..91d240d2 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_text_online.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_voice_away.png b/src/main/res/drawable-xhdpi/ic_send_voice_away.png new file mode 100644 index 00000000..34f8ea86 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_voice_away.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_voice_dnd.png b/src/main/res/drawable-xhdpi/ic_send_voice_dnd.png new file mode 100644 index 00000000..cea4212a Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_voice_dnd.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_voice_offline.png b/src/main/res/drawable-xhdpi/ic_send_voice_offline.png new file mode 100644 index 00000000..fc4cff1f Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_voice_offline.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_voice_online.png b/src/main/res/drawable-xhdpi/ic_send_voice_online.png new file mode 100644 index 00000000..d2f03dd5 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_voice_online.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_action_send_now_away.png b/src/main/res/drawable-xxhdpi/ic_action_send_now_away.png deleted file mode 100644 index 12ec4d33..00000000 Binary files a/src/main/res/drawable-xxhdpi/ic_action_send_now_away.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_action_send_now_dnd.png b/src/main/res/drawable-xxhdpi/ic_action_send_now_dnd.png deleted file mode 100644 index 7719f81a..00000000 Binary files a/src/main/res/drawable-xxhdpi/ic_action_send_now_dnd.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_action_send_now_offline.png b/src/main/res/drawable-xxhdpi/ic_action_send_now_offline.png deleted file mode 100644 index 18895813..00000000 Binary files a/src/main/res/drawable-xxhdpi/ic_action_send_now_offline.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_action_send_now_online.png b/src/main/res/drawable-xxhdpi/ic_action_send_now_online.png deleted file mode 100644 index 29bde36e..00000000 Binary files a/src/main/res/drawable-xxhdpi/ic_action_send_now_online.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_launcher.png b/src/main/res/drawable-xxhdpi/ic_launcher.png index 0e06656f..e69b9c8d 100644 Binary files a/src/main/res/drawable-xxhdpi/ic_launcher.png and b/src/main/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_notification.png b/src/main/res/drawable-xxhdpi/ic_notification.png index c2ee5dec..42c62d32 100644 Binary files a/src/main/res/drawable-xxhdpi/ic_notification.png and b/src/main/res/drawable-xxhdpi/ic_notification.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_received_indicator.png b/src/main/res/drawable-xxhdpi/ic_received_indicator.png index 039a9ef9..5d1c9b87 100644 Binary files a/src/main/res/drawable-xxhdpi/ic_received_indicator.png and b/src/main/res/drawable-xxhdpi/ic_received_indicator.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_location_away.png b/src/main/res/drawable-xxhdpi/ic_send_location_away.png new file mode 100644 index 00000000..4fb370ff Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_location_away.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_location_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_location_dnd.png new file mode 100644 index 00000000..ea3d1502 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_location_dnd.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_location_offline.png b/src/main/res/drawable-xxhdpi/ic_send_location_offline.png new file mode 100644 index 00000000..b4317aae Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_location_offline.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_location_online.png b/src/main/res/drawable-xxhdpi/ic_send_location_online.png new file mode 100644 index 00000000..10dfed81 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_location_online.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_photo_away.png b/src/main/res/drawable-xxhdpi/ic_send_photo_away.png new file mode 100644 index 00000000..78eea39e Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_photo_away.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png new file mode 100644 index 00000000..09c11a81 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_photo_offline.png b/src/main/res/drawable-xxhdpi/ic_send_photo_offline.png new file mode 100644 index 00000000..6b41c3bd Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_photo_offline.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_photo_online.png b/src/main/res/drawable-xxhdpi/ic_send_photo_online.png new file mode 100644 index 00000000..1c8992c5 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_photo_online.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_text_away.png b/src/main/res/drawable-xxhdpi/ic_send_text_away.png new file mode 100644 index 00000000..2b2b0793 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_text_away.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_text_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_text_dnd.png new file mode 100644 index 00000000..0d7e7053 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_text_dnd.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_text_offline.png b/src/main/res/drawable-xxhdpi/ic_send_text_offline.png new file mode 100644 index 00000000..6bd9c414 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_text_offline.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_text_online.png b/src/main/res/drawable-xxhdpi/ic_send_text_online.png new file mode 100644 index 00000000..cb6a2dba Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_text_online.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_voice_away.png b/src/main/res/drawable-xxhdpi/ic_send_voice_away.png new file mode 100644 index 00000000..b8b9e807 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_voice_away.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png new file mode 100644 index 00000000..a5151331 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_voice_offline.png b/src/main/res/drawable-xxhdpi/ic_send_voice_offline.png new file mode 100644 index 00000000..3d58f699 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_voice_offline.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_voice_online.png b/src/main/res/drawable-xxhdpi/ic_send_voice_online.png new file mode 100644 index 00000000..600371eb Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_voice_online.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_launcher.png b/src/main/res/drawable-xxxhdpi/ic_launcher.png index b6dcb0b9..668504df 100644 Binary files a/src/main/res/drawable-xxxhdpi/ic_launcher.png and b/src/main/res/drawable-xxxhdpi/ic_launcher.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_notification.png b/src/main/res/drawable-xxxhdpi/ic_notification.png index ee2f3a43..c3439f1a 100644 Binary files a/src/main/res/drawable-xxxhdpi/ic_notification.png and b/src/main/res/drawable-xxxhdpi/ic_notification.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_received_indicator.png b/src/main/res/drawable-xxxhdpi/ic_received_indicator.png index 86db9890..f35c8b44 100644 Binary files a/src/main/res/drawable-xxxhdpi/ic_received_indicator.png and b/src/main/res/drawable-xxxhdpi/ic_received_indicator.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_location_away.png b/src/main/res/drawable-xxxhdpi/ic_send_location_away.png new file mode 100644 index 00000000..0fab2554 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_location_away.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_location_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_location_dnd.png new file mode 100644 index 00000000..08e2b39b Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_location_dnd.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_location_offline.png b/src/main/res/drawable-xxxhdpi/ic_send_location_offline.png new file mode 100644 index 00000000..2af75cde Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_location_offline.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_location_online.png b/src/main/res/drawable-xxxhdpi/ic_send_location_online.png new file mode 100644 index 00000000..2e54ef89 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_location_online.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_photo_away.png b/src/main/res/drawable-xxxhdpi/ic_send_photo_away.png new file mode 100644 index 00000000..ba171ce1 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_photo_away.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.png new file mode 100644 index 00000000..fccb32dc Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_photo_offline.png b/src/main/res/drawable-xxxhdpi/ic_send_photo_offline.png new file mode 100644 index 00000000..e94e930d Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_photo_offline.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_photo_online.png b/src/main/res/drawable-xxxhdpi/ic_send_photo_online.png new file mode 100644 index 00000000..1bf680eb Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_photo_online.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_text_away.png b/src/main/res/drawable-xxxhdpi/ic_send_text_away.png new file mode 100644 index 00000000..afcfa89d Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_text_away.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png new file mode 100644 index 00000000..929a33a4 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_text_offline.png b/src/main/res/drawable-xxxhdpi/ic_send_text_offline.png new file mode 100644 index 00000000..b9122e45 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_text_offline.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_text_online.png b/src/main/res/drawable-xxxhdpi/ic_send_text_online.png new file mode 100644 index 00000000..abec2e0b Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_text_online.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_voice_away.png b/src/main/res/drawable-xxxhdpi/ic_send_voice_away.png new file mode 100644 index 00000000..de1375e2 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_voice_away.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.png new file mode 100644 index 00000000..8ac667be Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_voice_offline.png b/src/main/res/drawable-xxxhdpi/ic_send_voice_offline.png new file mode 100644 index 00000000..eec3d8f2 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_voice_offline.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_voice_online.png b/src/main/res/drawable-xxxhdpi/ic_send_voice_online.png new file mode 100644 index 00000000..fcdfcb43 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_voice_online.png differ diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index f9aae10a..5aa7dffa 100644 --- a/src/main/res/layout/fragment_conversation.xml +++ b/src/main/res/layout/fragment_conversation.xml @@ -57,7 +57,7 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:background="?android:selectableItemBackground" - android:src="@drawable/ic_action_send_now_offline" /> + android:src="@drawable/ic_send_text_offline" /> -1 + + @string/none + @string/recently_used + @string/attach_take_picture + @string/attach_record_voice + @string/send_location + + + + none + recent + photo + voice + location + diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index cc7727d2..4631bd60 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -1,397 +1,397 @@ - Conversations - Settings - New conversation - Manage accounts - End this conversation - Contact details - Conference details - Secure conversation - Add account - Edit name - Add to phone book - Delete from roster - Block contact - Unblock contact - Block domain - Unblock domain - Manage Accounts - Settings - Conference Details - Contact Details - Share with Conversation - Start Conversation - Choose contact - Block list - just now - 1 min ago - %d mins ago - unread Conversations - sending… - Decrypting message. Please wait… - Nickname is already in use - Admin - Owner - Moderator - Participant - Visitor - Would you like to remove %s from your roster? The conversation associated with this contact will not be removed. - Would you like to block %s from sending you messages? - Would you like to unblock %s and allow them to send you messages? - Block all contacts from %s? - Unblock all contacts from %s? - Contact blocked - Would you like to remove %s as a bookmark? The conversation associated with this bookmark will not be removed. - Register new account on server - Change password on server - Share with… - Start Conversation - Invite Contact - Contacts - Cancel - Set - Add - Edit - Delete - Block - Unblock - Save - OK - Conversations has crashed - By sending in stack traces you are helping the ongoing development of Conversations\nWarning: This will use your XMPP account to send the stack trace to the developer. - Send now - Never ask again - Unable to connect to account - Unable to connect to multiple accounts - Touch here to manage your accounts - Attach file - The contact is not in your roster. Would you like to add it? - Add contact - delivery failed - rejected - Preparing image for transmission - Clear history - Clear Conversation History - Do you want to delete all messages within this Conversation?\n\nWarning: This will not influence messages stored on other devices or servers. - Delete messages - End this conversations afterwards - Choose presence to contact - Send plain text message - Send OTR encrypted message - Send OpenPGP encrypted message - Your nickname has been changed - Download Image - Send unencrypted - Decryption failed. Maybe you don’t have the proper private key. - OpenKeychain - Conversations utilizes a third party app called OpenKeychain to encrypt and decrypt messages and to manage your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n(Please restart Conversations afterwards.) - Restart - Install - offering… - waiting… - No OpenPGP Key found - Conversations is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\nPlease ask your contact to setup OpenPGP. - No OpenPGP Keys found - Conversations is unable to encrypt your messages because your contacts are not announcing their public key.\n\nPlease ask your contacts to setup OpenPGP. - Encrypted message received. Touch to view and decrypt. - General - XMPP resource - The name this client identifies itself with - Accept files - Automatically accept files smaller than… - Notification Settings - Notifications - Notify when a new message arrives - Vibrate - Also vibrate when a new message arrives - Sound - Play ringtone with notification - Conference notifications - Always notify when a new conference message arrives instead of only when highlighted - Notification grace period - Disable notifications for a short time after a carbon copy was received - Advanced Options - Never send crash reports - By sending in stack traces you are helping the ongoing development of Conversations - Confirm Messages - Let your contact know when you have received and read a message - UI Options - OpenKeychain reported an error - I/O Error decrypting file - Accept - An error has occurred - Grant presence updates - Preemptively grant and ask for presence subscription for contacts you created - Subscriptions - Your account - Keys - Send presence updates - Receive presence updates - Ask for presence updates - Choose picture - Take picture - Preemptively grant subscription request - The file you selected is not an image - Error while converting the image file - File not found - General I/O error. Maybe you ran out of storage space? - The app you used to select this image did not provide us with enough permissions to read the file.\n\nUse a different file manager to choose an image - Unknown - Temporarily disabled - Online - Connecting\u2026 - Offline - Unauthorized - Server not found - No connectivity - Registration failed - Username already in use - Registration completed - Server does not support registration - Security error - Incompatible server - Plain text - OTR - OpenPGP - Edit account - Delete account - Temporarily disable - Publish avatar - Publish OpenPGP public key - Enable account - Are you sure? - If you delete your account your entire conversation history will be lost - Record voice - Jabber ID - Password - username@example.com - Confirm password - Password - Confirm password - Passwords do not match - This is not a valid Jabber ID - Out of memory. Image is too large - Do you want to add %s to your phones contact list? - online - free to chat - away - extended away - do not disturb - offline - Conference - Other Members - Server info - XEP-0313: MAM - XEP-0280: Message Carbons - XEP-0352: Client State Indication - XEP-0191: Blocking Command - XEP-0237: Roster Versioning - XEP-0198: Stream Management - XEP-0163: PEP (Avatars) - available - unavailable - Missing public key announcements - last seen just now - last seen 1 minute ago - last seen %d minutes ago - last seen 1 hour ago - last seen %d hours ago - last seen 1 day ago - last seen %d days ago - never seen - Encrypted message. Please install OpenKeychain to decrypt. - Unknown OTR fingerprint - OpenPGP encrypted messages found - Reception failed - Your fingerprint - OTR fingerprint - Verify - Decrypt - Conferences - Search - Create Contact - Join Conference - Delete Contact - View contact details - Block contact - Unblock contact - Create - The contact already exists - Join - Conference address - room@conference.example.com - Save as bookmark - Delete bookmark - This bookmark already exists - You - Edit conference subject - Conference not found - Leave - Contact added you to contact list - Add back - %s has read up to this point - Publish - Touch avatar to select picture from gallery - Please note: Everyone subscribed to your presence updates will be allowed to see this picture. - Publishing… - The server rejected your publication - Something went wrong while converting your picture - Could not save avatar to disk - (Or long press to bring back default) - Your server does not support the publication of avatars - whispered - to %s - Send private message to %s - Connect - This account already exists - Next - Current session established - Additional Information - Skip - Disable notifications - Disable notifications for this conversation - Notifications are disabled - Enable - Conference requires password - Enter password - Missing presence updates from contact - Please request presence updates from your contact first.\n\nThis will be used to determine what client(s) your contact is using. - Request now - Delete Fingerprint - Are you sure you would like to delete this fingerprint? - Ignore - Warning: Sending this without mutual presence updates could cause unexpected problems.\n\nGo to contact details to verify your presence subscriptions. - Encryption settings - Force end-to-end encryption - Always send messages encrypted (except for conferences) - Don’t save encrypted messages - Warning: This could lead to message loss - Expert options - Please be careful with these - About Conversations - Build and licensing information - - Conversations • the very last word in instant messaging. - \n\nCopyright © 2014 Daniel Gultsch - \n\nThis program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - \n\nThis program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - \n\nYou should have received a copy of the GNU General Public License - along with this program. If not, see https://www.gnu.org/licenses - \n\nDownload the full source code at https://github.com/siacs/Conversations - \n\n\nLibraries - \n\nhttps://www.bouncycastle.org\n(The MIT License (MIT)) - \n\nhttps://www.gnu.org/software/libidn\n(Apache License, Version 2.0) - \n\nhttps://github.com/ge0rg/MemorizingTrustManager\n(The MIT License (MIT)) - \n\nhttps://github.com/rtreffer/minidns\n(WTFPL) - \n\nhttps://github.com/open-keychain/openkeychain-api-lib\n(Apache License, Version 2.0) - \n\nhttps://github.com/jitsi/otr4j\n(LGPL-3.0) - \n\nhttps://developer.android.com/tools/support-library\n(Apache License, Version 2.0) - \n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0) - \n\nhttps://github.com/google/material-design-icons\n(CC BY 4.0) - \n\nhttps://github.com/timroes/EnhancedListView\n(Apache License, Version 2.0) - - Quiet Hours - Start time - End time - Enable quiet hours - Notifications will be silenced during quiet hours - Increase font size - Use larger font sizes across the entire app - Send button indicates status - Request message receipts - Received messages will be marked with a green tick if supported - Colorize send button to indicate contact status - Other - Conference name - Use room’s subject instead of JID to identify conferences - OTR fingerprint copied to clipboard! - You are banned from this conference - This conference is members only - You have been kicked from this conference - using account %s - Checking image on HTTP host - The image file has been deleted - You are not connected. Try again later - Check image file size - Message options - Copy text - Copy original URL - Send again - Image URL - Message text - URL copied to clipboard - Message copied to clipboard - Image transmission failed - Scan QR code - Show QR code - Show block list - Account details - Verify OTR - Remote Fingerprint - scan - (or touch phones) - Socialist Millionaire Protocol - Hint or Question - Shared Secret - Confirm - In progress - Respond - Failed - Secrets do not match - Try again - Finish - Verified! - Contact requested SMP verification - No valid OTR session has been found! - Conversations - Keep service in foreground - Prevents the operating system from killing your connection - Choose file - Receiving %1$s (%2$d%% completed) - Download %s - file - Open %s - sending (%1$d%% completed) - Preparing file for transmission - %s offered for download - Cancel transmission - file transmission failed - The file has been deleted - No application found to open file - Could not verify fingerprint - Manually verify - Are you sure that you want to verify your contacts OTR fingerprint? - Show dynamic tags - Display read-only tags underneath contacts - Enable notifications - Create conference with… - No conference server found - Conference creation failed! - Conference created! - Secret accepted! - Reset - Account avatar - Copy OTR fingerprint to clipboard - Fetching history from server - No more history on server - Updating… - Password changed! - Could not change password - Send a message to start an encrypted chat - Ask question - If you and your contact have a secret in common that no one else knows (like an inside joke or simply what you had for lunch the last time you met) you can use that secret to verify each other’s fingerprints.\n\nYou provide a hint or a question for your contact who will respond with a case-sensitive answer. - Your contact would like to verify your fingerprint by challenging you with a shared secret. Your contact provided the following hint or question for that secret. - Your hint should not be empty - Your shared secret can not be empty - Carefully compare the fingerprint shown below with the fingerprint of your contact.\nYou can use any trusted form of communication like an encrypted e-mail or a telephone call to exchange those. + Conversations + Settings + New conversation + Manage accounts + End this conversation + Contact details + Conference details + Secure conversation + Add account + Edit name + Add to phone book + Delete from roster + Block contact + Unblock contact + Block domain + Unblock domain + Manage Accounts + Settings + Conference Details + Contact Details + Share with Conversation + Start Conversation + Choose contact + Block list + just now + 1 min ago + %d mins ago + unread Conversations + sending… + Decrypting message. Please wait… + Nickname is already in use + Admin + Owner + Moderator + Participant + Visitor + Would you like to remove %s from your roster? The conversation associated with this contact will not be removed. + Would you like to block %s from sending you messages? + Would you like to unblock %s and allow them to send you messages? + Block all contacts from %s? + Unblock all contacts from %s? + Contact blocked + Would you like to remove %s as a bookmark? The conversation associated with this bookmark will not be removed. + Register new account on server + Change password on server + Share with… + Start Conversation + Invite Contact + Contacts + Cancel + Set + Add + Edit + Delete + Block + Unblock + Save + OK + Conversations has crashed + By sending in stack traces you are helping the ongoing development of Conversations\nWarning: This will use your XMPP account to send the stack trace to the developer. + Send now + Never ask again + Unable to connect to account + Unable to connect to multiple accounts + Touch here to manage your accounts + Attach file + The contact is not in your roster. Would you like to add it? + Add contact + delivery failed + rejected + Preparing image for transmission + Clear history + Clear Conversation History + Do you want to delete all messages within this Conversation?\n\nWarning: This will not influence messages stored on other devices or servers. + Delete messages + End this conversations afterwards + Choose presence to contact + Send plain text message + Send OTR encrypted message + Send OpenPGP encrypted message + Your nickname has been changed + Download Image + Send unencrypted + Decryption failed. Maybe you don’t have the proper private key. + OpenKeychain + Conversations utilizes a third party app called OpenKeychain to encrypt and decrypt messages and to manage your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n(Please restart Conversations afterwards.) + Restart + Install + offering… + waiting… + No OpenPGP Key found + Conversations is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\nPlease ask your contact to setup OpenPGP. + No OpenPGP Keys found + Conversations is unable to encrypt your messages because your contacts are not announcing their public key.\n\nPlease ask your contacts to setup OpenPGP. + Encrypted message received. Touch to view and decrypt. + General + XMPP resource + The name this client identifies itself with + Accept files + Automatically accept files smaller than… + Notification Settings + Notifications + Notify when a new message arrives + Vibrate + Also vibrate when a new message arrives + Sound + Play ringtone with notification + Conference notifications + Always notify when a new conference message arrives instead of only when highlighted + Notification grace period + Disable notifications for a short time after a carbon copy was received + Advanced Options + Never send crash reports + By sending in stack traces you are helping the ongoing development of Conversations + Confirm Messages + Let your contact know when you have received and read a message + UI Options + OpenKeychain reported an error + I/O Error decrypting file + Accept + An error has occurred + Grant presence updates + Preemptively grant and ask for presence subscription for contacts you created + Subscriptions + Your account + Keys + Send presence updates + Receive presence updates + Ask for presence updates + Choose picture + Take picture + Preemptively grant subscription request + The file you selected is not an image + Error while converting the image file + File not found + General I/O error. Maybe you ran out of storage space? + The app you used to select this image did not provide us with enough permissions to read the file.\n\nUse a different file manager to choose an image + Unknown + Temporarily disabled + Online + Connecting\u2026 + Offline + Unauthorized + Server not found + No connectivity + Registration failed + Username already in use + Registration completed + Server does not support registration + Security error + Incompatible server + Plain text + OTR + OpenPGP + Edit account + Delete account + Temporarily disable + Publish avatar + Publish OpenPGP public key + Enable account + Are you sure? + If you delete your account your entire conversation history will be lost + Record voice + Jabber ID + Password + username@example.com + Confirm password + Password + Confirm password + Passwords do not match + This is not a valid Jabber ID + Out of memory. Image is too large + Do you want to add %s to your phones contact list? + online + free to chat + away + extended away + do not disturb + offline + Conference + Other Members + Server info + XEP-0313: MAM + XEP-0280: Message Carbons + XEP-0352: Client State Indication + XEP-0191: Blocking Command + XEP-0237: Roster Versioning + XEP-0198: Stream Management + XEP-0163: PEP (Avatars) + available + unavailable + Missing public key announcements + last seen just now + last seen 1 minute ago + last seen %d minutes ago + last seen 1 hour ago + last seen %d hours ago + last seen 1 day ago + last seen %d days ago + never seen + Encrypted message. Please install OpenKeychain to decrypt. + Unknown OTR fingerprint + OpenPGP encrypted messages found + Reception failed + Your fingerprint + OTR fingerprint + Verify + Decrypt + Conferences + Search + Create Contact + Join Conference + Delete Contact + View contact details + Block contact + Unblock contact + Create + The contact already exists + Join + Conference address + room@conference.example.com + Save as bookmark + Delete bookmark + This bookmark already exists + You + Edit conference subject + Conference not found + Leave + Contact added you to contact list + Add back + %s has read up to this point + Publish + Touch avatar to select picture from gallery + Please note: Everyone subscribed to your presence updates will be allowed to see this picture. + Publishing… + The server rejected your publication + Something went wrong while converting your picture + Could not save avatar to disk + (Or long press to bring back default) + Your server does not support the publication of avatars + whispered + to %s + Send private message to %s + Connect + This account already exists + Next + Current session established + Additional Information + Skip + Disable notifications + Disable notifications for this conversation + Notifications are disabled + Enable + Conference requires password + Enter password + Missing presence updates from contact + Please request presence updates from your contact first.\n\nThis will be used to determine what client(s) your contact is using. + Request now + Delete Fingerprint + Are you sure you would like to delete this fingerprint? + Ignore + Warning: Sending this without mutual presence updates could cause unexpected problems.\n\nGo to contact details to verify your presence subscriptions. + Encryption settings + Force end-to-end encryption + Always send messages encrypted (except for conferences) + Don’t save encrypted messages + Warning: This could lead to message loss + Expert options + Please be careful with these + About Conversations + Build and licensing information + + Conversations • the very last word in instant messaging. + \n\nCopyright © 2014 Daniel Gultsch + \n\nThis program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + \n\nThis program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + \n\nYou should have received a copy of the GNU General Public License + along with this program. If not, see https://www.gnu.org/licenses + \n\nDownload the full source code at https://github.com/siacs/Conversations + \n\n\nLibraries + \n\nhttps://www.bouncycastle.org\n(The MIT License (MIT)) + \n\nhttps://www.gnu.org/software/libidn\n(Apache License, Version 2.0) + \n\nhttps://github.com/ge0rg/MemorizingTrustManager\n(The MIT License (MIT)) + \n\nhttps://github.com/rtreffer/minidns\n(WTFPL) + \n\nhttps://github.com/open-keychain/openkeychain-api-lib\n(Apache License, Version 2.0) + \n\nhttps://github.com/jitsi/otr4j\n(LGPL-3.0) + \n\nhttps://developer.android.com/tools/support-library\n(Apache License, Version 2.0) + \n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0) + \n\nhttps://github.com/google/material-design-icons\n(CC BY 4.0) + \n\nhttps://github.com/timroes/EnhancedListView\n(Apache License, Version 2.0) + + Quiet Hours + Start time + End time + Enable quiet hours + Notifications will be silenced during quiet hours + Increase font size + Use larger font sizes across the entire app + Send button indicates status + Request message receipts + Received messages will be marked with a green tick if supported + Colorize send button to indicate contact status + Other + Conference name + Use room’s subject instead of JID to identify conferences + OTR fingerprint copied to clipboard! + You are banned from this conference + This conference is members only + You have been kicked from this conference + using account %s + Checking image on HTTP host + The image file has been deleted + You are not connected. Try again later + Check image file size + Message options + Copy text + Copy original URL + Send again + Image URL + Message text + URL copied to clipboard + Message copied to clipboard + Image transmission failed + Scan QR code + Show QR code + Show block list + Account details + Verify OTR + Remote Fingerprint + scan + (or touch phones) + Socialist Millionaire Protocol + Hint or Question + Shared Secret + Confirm + In progress + Respond + Failed + Secrets do not match + Try again + Finish + Verified! + Contact requested SMP verification + No valid OTR session has been found! + Conversations + Keep service in foreground + Prevents the operating system from killing your connection + Choose file + Receiving %1$s (%2$d%% completed) + Download %s + file + Open %s + sending (%1$d%% completed) + Preparing file for transmission + %s offered for download + Cancel transmission + file transmission failed + The file has been deleted + No application found to open file + Could not verify fingerprint + Manually verify + Are you sure that you want to verify your contacts OTR fingerprint? + Show dynamic tags + Display read-only tags underneath contacts + Enable notifications + Create conference with… + No conference server found + Conference creation failed! + Conference created! + Secret accepted! + Reset + Account avatar + Copy OTR fingerprint to clipboard + Fetching history from server + No more history on server + Updating… + Password changed! + Could not change password + Send a message to start an encrypted chat + Ask question + If you and your contact have a secret in common that no one else knows (like an inside joke or simply what you had for lunch the last time you met) you can use that secret to verify each other’s fingerprints.\n\nYou provide a hint or a question for your contact who will respond with a case-sensitive answer. + Your contact would like to verify your fingerprint by challenging you with a shared secret. Your contact provided the following hint or question for that secret. + Your hint should not be empty + Your shared secret can not be empty + Carefully compare the fingerprint shown below with the fingerprint of your contact.\nYou can use any trusted form of communication like an encrypted e-mail or a telephone call to exchange those. Change password Current password New password @@ -442,19 +442,19 @@ Disable foreground service Touch to open Conversations Avatar has been published! - Sending %s - Offering %s - Hide offline - Disable Account - %s is typing... - %s has stopped typing - Typing notifications - Let your contact know when you are writing a new message - Send location - Show location - No application found to display location - Location - Received location + Sending %s + Offering %s + Hide offline + Disable Account + %s is typing... + %s has stopped typing + Typing notifications + Let your contact know when you are writing a new message + Send location + Show location + No application found to display location + Location + Received location Conversation closed Left conference Certificate options @@ -474,4 +474,9 @@ Select %d contact Select %d contacts + Replace send button with quick action + Quick Action + None + Most recently used + Choose quick action diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 417e60a4..5b7d6904 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -105,6 +105,14 @@ android:key="send_button_status" android:summary="@string/pref_use_send_button_to_indicate_status_summary" android:title="@string/pref_use_send_button_to_indicate_status" /> + Date: Sun, 3 May 2015 09:30:30 +0200 Subject: turn send button in cancel button while in whisper mode --- src/main/res/drawable-hdpi/ic_send_cancel_away.png | Bin 0 -> 1396 bytes src/main/res/drawable-hdpi/ic_send_cancel_dnd.png | Bin 0 -> 1559 bytes src/main/res/drawable-hdpi/ic_send_cancel_offline.png | Bin 0 -> 1206 bytes src/main/res/drawable-hdpi/ic_send_cancel_online.png | Bin 0 -> 1531 bytes src/main/res/drawable-mdpi/ic_send_cancel_away.png | Bin 0 -> 901 bytes src/main/res/drawable-mdpi/ic_send_cancel_dnd.png | Bin 0 -> 1040 bytes src/main/res/drawable-mdpi/ic_send_cancel_offline.png | Bin 0 -> 837 bytes src/main/res/drawable-mdpi/ic_send_cancel_online.png | Bin 0 -> 1052 bytes src/main/res/drawable-xhdpi/ic_send_cancel_away.png | Bin 0 -> 1724 bytes src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png | Bin 0 -> 1940 bytes src/main/res/drawable-xhdpi/ic_send_cancel_offline.png | Bin 0 -> 1519 bytes src/main/res/drawable-xhdpi/ic_send_cancel_online.png | Bin 0 -> 1978 bytes src/main/res/drawable-xxhdpi/ic_send_cancel_away.png | Bin 0 -> 2583 bytes src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.png | Bin 0 -> 2911 bytes src/main/res/drawable-xxhdpi/ic_send_cancel_offline.png | Bin 0 -> 2290 bytes src/main/res/drawable-xxhdpi/ic_send_cancel_online.png | Bin 0 -> 2998 bytes src/main/res/drawable-xxxhdpi/ic_send_cancel_away.png | Bin 0 -> 3377 bytes src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.png | Bin 0 -> 3791 bytes src/main/res/drawable-xxxhdpi/ic_send_cancel_offline.png | Bin 0 -> 2956 bytes src/main/res/drawable-xxxhdpi/ic_send_cancel_online.png | Bin 0 -> 3835 bytes 20 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/res/drawable-hdpi/ic_send_cancel_away.png create mode 100644 src/main/res/drawable-hdpi/ic_send_cancel_dnd.png create mode 100644 src/main/res/drawable-hdpi/ic_send_cancel_offline.png create mode 100644 src/main/res/drawable-hdpi/ic_send_cancel_online.png create mode 100644 src/main/res/drawable-mdpi/ic_send_cancel_away.png create mode 100644 src/main/res/drawable-mdpi/ic_send_cancel_dnd.png create mode 100644 src/main/res/drawable-mdpi/ic_send_cancel_offline.png create mode 100644 src/main/res/drawable-mdpi/ic_send_cancel_online.png create mode 100644 src/main/res/drawable-xhdpi/ic_send_cancel_away.png create mode 100644 src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png create mode 100644 src/main/res/drawable-xhdpi/ic_send_cancel_offline.png create mode 100644 src/main/res/drawable-xhdpi/ic_send_cancel_online.png create mode 100644 src/main/res/drawable-xxhdpi/ic_send_cancel_away.png create mode 100644 src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.png create mode 100644 src/main/res/drawable-xxhdpi/ic_send_cancel_offline.png create mode 100644 src/main/res/drawable-xxhdpi/ic_send_cancel_online.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_send_cancel_away.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_send_cancel_offline.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_send_cancel_online.png (limited to 'src/main/res') diff --git a/src/main/res/drawable-hdpi/ic_send_cancel_away.png b/src/main/res/drawable-hdpi/ic_send_cancel_away.png new file mode 100644 index 00000000..9525c040 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_cancel_away.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_cancel_dnd.png b/src/main/res/drawable-hdpi/ic_send_cancel_dnd.png new file mode 100644 index 00000000..cbfd8e76 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_cancel_dnd.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_cancel_offline.png b/src/main/res/drawable-hdpi/ic_send_cancel_offline.png new file mode 100644 index 00000000..2cb4f4f3 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_cancel_offline.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_cancel_online.png b/src/main/res/drawable-hdpi/ic_send_cancel_online.png new file mode 100644 index 00000000..cb3bc3b5 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_cancel_online.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_cancel_away.png b/src/main/res/drawable-mdpi/ic_send_cancel_away.png new file mode 100644 index 00000000..bbc86b45 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_cancel_away.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_cancel_dnd.png b/src/main/res/drawable-mdpi/ic_send_cancel_dnd.png new file mode 100644 index 00000000..e4fa38a3 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_cancel_dnd.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_cancel_offline.png b/src/main/res/drawable-mdpi/ic_send_cancel_offline.png new file mode 100644 index 00000000..604dfefa Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_cancel_offline.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_cancel_online.png b/src/main/res/drawable-mdpi/ic_send_cancel_online.png new file mode 100644 index 00000000..1b0d1811 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_cancel_online.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_cancel_away.png b/src/main/res/drawable-xhdpi/ic_send_cancel_away.png new file mode 100644 index 00000000..44b5f096 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_cancel_away.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png b/src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png new file mode 100644 index 00000000..276ad024 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_cancel_offline.png b/src/main/res/drawable-xhdpi/ic_send_cancel_offline.png new file mode 100644 index 00000000..53a9ac90 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_cancel_offline.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_cancel_online.png b/src/main/res/drawable-xhdpi/ic_send_cancel_online.png new file mode 100644 index 00000000..23a5f263 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_cancel_online.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_cancel_away.png b/src/main/res/drawable-xxhdpi/ic_send_cancel_away.png new file mode 100644 index 00000000..07113f02 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_cancel_away.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.png new file mode 100644 index 00000000..93fbc44d Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_cancel_offline.png b/src/main/res/drawable-xxhdpi/ic_send_cancel_offline.png new file mode 100644 index 00000000..10412fab Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_cancel_offline.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_cancel_online.png b/src/main/res/drawable-xxhdpi/ic_send_cancel_online.png new file mode 100644 index 00000000..6fa18239 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_cancel_online.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_cancel_away.png b/src/main/res/drawable-xxxhdpi/ic_send_cancel_away.png new file mode 100644 index 00000000..a9340a88 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_cancel_away.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.png new file mode 100644 index 00000000..02ab1d0f Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_cancel_offline.png b/src/main/res/drawable-xxxhdpi/ic_send_cancel_offline.png new file mode 100644 index 00000000..abd3af2c Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_cancel_offline.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_cancel_online.png b/src/main/res/drawable-xxxhdpi/ic_send_cancel_online.png new file mode 100644 index 00000000..80be8edf Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_cancel_online.png differ -- cgit v1.2.3 From 1e28f600386f1f1dcd734363c932d5ccbd6267fb Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 10 May 2015 03:14:13 +0200 Subject: changed conversation red to material red --- src/main/res/drawable-hdpi/ic_send_cancel_dnd.png | Bin 1559 -> 1587 bytes src/main/res/drawable-hdpi/ic_send_location_dnd.png | Bin 1333 -> 1333 bytes src/main/res/drawable-hdpi/ic_send_photo_dnd.png | Bin 1381 -> 1383 bytes src/main/res/drawable-hdpi/ic_send_text_dnd.png | Bin 1126 -> 1128 bytes src/main/res/drawable-hdpi/ic_send_voice_dnd.png | Bin 1149 -> 1161 bytes src/main/res/drawable-mdpi/ic_send_cancel_dnd.png | Bin 1040 -> 1025 bytes src/main/res/drawable-mdpi/ic_send_location_dnd.png | Bin 908 -> 917 bytes src/main/res/drawable-mdpi/ic_send_photo_dnd.png | Bin 909 -> 915 bytes src/main/res/drawable-mdpi/ic_send_text_dnd.png | Bin 769 -> 781 bytes src/main/res/drawable-mdpi/ic_send_voice_dnd.png | Bin 774 -> 795 bytes src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png | Bin 1940 -> 1958 bytes src/main/res/drawable-xhdpi/ic_send_location_dnd.png | Bin 1721 -> 1753 bytes src/main/res/drawable-xhdpi/ic_send_photo_dnd.png | Bin 1723 -> 1756 bytes src/main/res/drawable-xhdpi/ic_send_text_dnd.png | Bin 1395 -> 1430 bytes src/main/res/drawable-xhdpi/ic_send_voice_dnd.png | Bin 1426 -> 1419 bytes src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.png | Bin 2911 -> 2983 bytes src/main/res/drawable-xxhdpi/ic_send_location_dnd.png | Bin 2578 -> 2589 bytes src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png | Bin 2588 -> 2618 bytes src/main/res/drawable-xxhdpi/ic_send_text_dnd.png | Bin 2004 -> 2005 bytes src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png | Bin 2152 -> 2200 bytes src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.png | Bin 3791 -> 3862 bytes .../res/drawable-xxxhdpi/ic_send_location_dnd.png | Bin 3456 -> 3514 bytes src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.png | Bin 3544 -> 3569 bytes src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png | Bin 2597 -> 2592 bytes src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.png | Bin 2811 -> 2849 bytes src/main/res/values/colors.xml | 2 +- 26 files changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/res') diff --git a/src/main/res/drawable-hdpi/ic_send_cancel_dnd.png b/src/main/res/drawable-hdpi/ic_send_cancel_dnd.png index cbfd8e76..83a7b94b 100644 Binary files a/src/main/res/drawable-hdpi/ic_send_cancel_dnd.png and b/src/main/res/drawable-hdpi/ic_send_cancel_dnd.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_location_dnd.png b/src/main/res/drawable-hdpi/ic_send_location_dnd.png index 3bcbe18a..a9c51317 100644 Binary files a/src/main/res/drawable-hdpi/ic_send_location_dnd.png and b/src/main/res/drawable-hdpi/ic_send_location_dnd.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_photo_dnd.png b/src/main/res/drawable-hdpi/ic_send_photo_dnd.png index 2eb85679..15b1eb7a 100644 Binary files a/src/main/res/drawable-hdpi/ic_send_photo_dnd.png and b/src/main/res/drawable-hdpi/ic_send_photo_dnd.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_text_dnd.png b/src/main/res/drawable-hdpi/ic_send_text_dnd.png index 706b6505..b43428de 100644 Binary files a/src/main/res/drawable-hdpi/ic_send_text_dnd.png and b/src/main/res/drawable-hdpi/ic_send_text_dnd.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_voice_dnd.png b/src/main/res/drawable-hdpi/ic_send_voice_dnd.png index 50184ee8..26a89e8e 100644 Binary files a/src/main/res/drawable-hdpi/ic_send_voice_dnd.png and b/src/main/res/drawable-hdpi/ic_send_voice_dnd.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_cancel_dnd.png b/src/main/res/drawable-mdpi/ic_send_cancel_dnd.png index e4fa38a3..75006446 100644 Binary files a/src/main/res/drawable-mdpi/ic_send_cancel_dnd.png and b/src/main/res/drawable-mdpi/ic_send_cancel_dnd.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_location_dnd.png b/src/main/res/drawable-mdpi/ic_send_location_dnd.png index 92e68ee3..3f4d6aa4 100644 Binary files a/src/main/res/drawable-mdpi/ic_send_location_dnd.png and b/src/main/res/drawable-mdpi/ic_send_location_dnd.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_photo_dnd.png b/src/main/res/drawable-mdpi/ic_send_photo_dnd.png index 7b6700d6..08033f63 100644 Binary files a/src/main/res/drawable-mdpi/ic_send_photo_dnd.png and b/src/main/res/drawable-mdpi/ic_send_photo_dnd.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_text_dnd.png b/src/main/res/drawable-mdpi/ic_send_text_dnd.png index 92df9d3d..c3d9e79a 100644 Binary files a/src/main/res/drawable-mdpi/ic_send_text_dnd.png and b/src/main/res/drawable-mdpi/ic_send_text_dnd.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_voice_dnd.png b/src/main/res/drawable-mdpi/ic_send_voice_dnd.png index ef25b1c4..aaf8ff32 100644 Binary files a/src/main/res/drawable-mdpi/ic_send_voice_dnd.png and b/src/main/res/drawable-mdpi/ic_send_voice_dnd.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png b/src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png index 276ad024..dde1b707 100644 Binary files a/src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png and b/src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_location_dnd.png b/src/main/res/drawable-xhdpi/ic_send_location_dnd.png index 90ce346c..99c8ce36 100644 Binary files a/src/main/res/drawable-xhdpi/ic_send_location_dnd.png and b/src/main/res/drawable-xhdpi/ic_send_location_dnd.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_photo_dnd.png b/src/main/res/drawable-xhdpi/ic_send_photo_dnd.png index 2c37db74..fc69cb41 100644 Binary files a/src/main/res/drawable-xhdpi/ic_send_photo_dnd.png and b/src/main/res/drawable-xhdpi/ic_send_photo_dnd.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_text_dnd.png b/src/main/res/drawable-xhdpi/ic_send_text_dnd.png index 0a749f8d..8b93ec10 100644 Binary files a/src/main/res/drawable-xhdpi/ic_send_text_dnd.png and b/src/main/res/drawable-xhdpi/ic_send_text_dnd.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_voice_dnd.png b/src/main/res/drawable-xhdpi/ic_send_voice_dnd.png index cea4212a..66b0c677 100644 Binary files a/src/main/res/drawable-xhdpi/ic_send_voice_dnd.png and b/src/main/res/drawable-xhdpi/ic_send_voice_dnd.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.png index 93fbc44d..e68a912d 100644 Binary files a/src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.png and b/src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_location_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_location_dnd.png index ea3d1502..1773e62d 100644 Binary files a/src/main/res/drawable-xxhdpi/ic_send_location_dnd.png and b/src/main/res/drawable-xxhdpi/ic_send_location_dnd.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png index 09c11a81..fe33a1d0 100644 Binary files a/src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png and b/src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_text_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_text_dnd.png index 0d7e7053..32f5e29c 100644 Binary files a/src/main/res/drawable-xxhdpi/ic_send_text_dnd.png and b/src/main/res/drawable-xxhdpi/ic_send_text_dnd.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png index a5151331..4a5b4104 100644 Binary files a/src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png and b/src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.png index 02ab1d0f..307ca8a0 100644 Binary files a/src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.png and b/src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_location_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_location_dnd.png index 08e2b39b..e7f6fde7 100644 Binary files a/src/main/res/drawable-xxxhdpi/ic_send_location_dnd.png and b/src/main/res/drawable-xxxhdpi/ic_send_location_dnd.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.png index fccb32dc..8a9b0700 100644 Binary files a/src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.png and b/src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png index 929a33a4..b11cd6b6 100644 Binary files a/src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png and b/src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.png index 8ac667be..4ad9d389 100644 Binary files a/src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.png and b/src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.png differ diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index c21650a5..753a56df 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -11,7 +11,7 @@ #ffeeeeee #ff323232 #1f000000 - #ffe51c23 + #fff44336 #ffff9800 #ff259b24 -- cgit v1.2.3 From 22b12091a103a164a1d54874ad376d02dfee1519 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 11 May 2015 07:57:52 +0200 Subject: rewrote parts of message adapter to avoid using NULL views --- src/main/res/layout/message_null.xml | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 src/main/res/layout/message_null.xml (limited to 'src/main/res') diff --git a/src/main/res/layout/message_null.xml b/src/main/res/layout/message_null.xml deleted file mode 100644 index 0e0f1c92..00000000 --- a/src/main/res/layout/message_null.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file -- cgit v1.2.3 From ceadf2f6fb67666abb0d8f9b84a91841396cfc0a Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 11 May 2015 14:28:36 +0200 Subject: pulled updated translations from transifex --- src/main/res/values-ru/strings.xml | 2 ++ src/main/res/values-sr/strings.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/main/res') diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 2fc257f7..7b104820 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -441,11 +441,13 @@ Удалён %d сертификат Удалено %d сертификатов + Удалено %d сертификатов Выбран %d контакт Выбрано %d контактов + Выбрано %d контактов diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml index bcf420ba..ea5cbdb8 100644 --- a/src/main/res/values-sr/strings.xml +++ b/src/main/res/values-sr/strings.xml @@ -97,8 +97,8 @@ Опште ИксМПП ресурс Име са којим се овај клијент идентификује - Прихваћај фајлове - Аутоматски прихваћај фајлове мање од… + Прихватај фајлове + Аутоматски прихватај фајлове мање од… Поставке обавештења Обавештења Обавести кад стигне нова порука -- cgit v1.2.3 From b4a8984b18bed5673284d5fa4a5fcc256386d542 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 16 May 2015 10:19:05 +0200 Subject: pulled new translations from transifex --- src/main/res/values-ca/strings.xml | 34 +++- src/main/res/values-pl/strings.xml | 25 +++ src/main/res/values-zh-rCN/strings.xml | 295 +++++++++++++++++++++++++++------ 3 files changed, 302 insertions(+), 52 deletions(-) (limited to 'src/main/res') diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index a0861b16..9583932b 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -24,8 +24,8 @@ Escollir un contacte LLista bloqueix Ara - 1 min avans - %de minuts avans + 1 min abans + %de minuts abans Converses sense llegir o no llegides enviant… Desxifrant missatge. Espera si us plau… @@ -359,6 +359,7 @@ No s\'ha pogut canviar la contrasenya Començar a enviar un missatge de conversació xifrat Fer una pregunta + Si vosté i el seu contacte tenen un secret en comú que ningú més sap (com una broma o simplement el que vau dinar l\'última vegada que es van trobar) pot utilitzar aquest secret per comprovar les empremtes de cadascú.\n\nProporcionaràs una pista o una pregunta a la que el seu contacte donarà una resposta, que distingeix entre majúscules i minúscules. El seu contacte l\'hi agradaria verificar la seva empremta digital per un repte amb un secret compartit.El seu contacte proporciona el següent suggeriment o pregunta per aquest secret. El seu suggeriment no pot estar buit El teu secret compartit no pot estar buit @@ -416,4 +417,33 @@ Enviant %s Oferint %s Amaga el fora de línia + Deshabilita el compte + %s està escrivint... + %s ha deixat d\'escriure + Notificacions d\'escriptura + Permet el teu contacte saber quan estàs escrivint un missatge nou + Enviar localització + Mostrar localització + No s\'ha trobat cap aplicació per mostrar la localització + Localització + Localització rebuda + Conversa tancada + S\'ha sortit de la conferència + Opcions de certificats + No confiar en les CAs del sistema + Tots els certificats han de ser aprovats manualment + Eliminar certificats + Esborrar certificats aprovats manualment + No hi ha certificats aprovats manualment + Esborrar certificats + Esborrar selecció + Cancel·lar + + %d certificat esborrat + %d certificats esborrats + + + Seleccionar %d contacte + Seleccionar %d contactes + diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index e1849357..70c3a49d 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -202,6 +202,7 @@ Wiadomość zaszyfrowana. Zainstaluj OpenKeychain, żeby odszyfrować. Nieznany odcisk klucza OTR Znaleziono wiadomości zaszyfrowane przez OpenPGP + Odbiór nieudany Twój odcisk klucza Odcisk klucza OTR Weryfikuj @@ -236,7 +237,9 @@ Serwer odrzucił żądanie publikacji Wystąpił błąd podczas konwersji obrazu Nie udało się zapisać obrazu w pamięci urządzenia + (lub przytrzymaj długo, aby ustawić domyślny) Serwer nie udostępnia możliwości publikacji awatarów + szepcze do %s Wyślij prywatną wiadomość do %s Połącz @@ -252,10 +255,12 @@ Konferencja jest zabezpieczona hasłem Wprowadź hasło Kontakt nie udostępnia powiadomień o obecności + Poproś kontakt o udostępnienie powiadomień o obecności.\n\nPozwoli to na ustalenie klienta, z którego korzysta rozmówca. Zażądaj teraz Usuń odcisk klucza Czy na pewno chcesz usunąć odcisk klucza? Ignoruj + Uwaga: Wysyłanie bez obustronnych powiadomień o obecności może powodować nieoczekiwane problemy.\n\nSprawdź subskrypcję powiadomień w szczegółach kontaktu. Ustawienia szyfrowania Wymuszaj szyfrowanie typu end-to-end Szyfruj wszystkie wiadomości (poza konferencjami) @@ -283,6 +288,7 @@ Zbanowano cię w konferencji To jest zamknięty pokój Wyrzucono cię z konferencji + używając konta %s Sprawdzanie obrazka na hoście HTTP Obraz został usunięty Brak połączenia. Spróbuj ponownie później @@ -302,6 +308,7 @@ Szczegóły konta Weryfikuj OTR Zdalny odcisk klucza + skanuj (lub zetknij telefony) Protokół socialist millionaire Podpowiedź lub pytanie @@ -309,6 +316,7 @@ Potwierdź W toku Odpowiedz + Operacja nieudana Sekrety są niezgodne Spróbuj ponownie Zakończ @@ -382,6 +390,7 @@ Konferencja prywatna, dla zaakceptowanych uczestników Opcje konferencji Prywatna (tylko zaakceptowani) + Nieanonimowa Opcje konferencji zostały zmienione! Nie udało się zmienić opcji konferencji Nigdy @@ -420,7 +429,23 @@ Otrzymano lokalizację Zamknięto konwersację Opuszczono konferencję + Ustawienia certyfikatów Nie ufaj certyfikatom systemowym Wymagaj ręcznego potwierdzania certyfikatów + Usuń certyfikat + Wybierz zaufane certyfikaty do usunięcia + Brak ręcznie zaufanych certyfikatów + Usuń certyfikaty + Usuń zaznaczone Anuluj + + Usunięto %d certyfikat + Usunięto %d certyfikaty + Usunięto %d certyfikatów + + + %d kontakt wybrany + %d kontakty wybrane + %d kontaktów wybranych + diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index 49ca9b97..2f80e064 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -11,6 +11,10 @@ 编辑姓名 添加到手机通讯录 从列表中删除 + 屏蔽联系人 + 解除联系人屏蔽 + 屏蔽域名 + 解除域名屏蔽 管理账户 设置 讨论组详情 @@ -18,6 +22,7 @@ 分享会话 开始会话 选择联系人 + 屏蔽列表 刚刚 1 分钟前 %d分钟前 @@ -30,56 +35,65 @@ 版主 参与者 访客 - 将 %s从列表中移除? 与该联系人的会话消息不会清除. - 从书签中移除 %s?相关会话消息不会被清除 . + 将 %s 从列表中移除? 与该联系人的会话消息不会清除. + 你想屏蔽 %s 将不能发送信息给你？ + 你想解除对 %s 的屏蔽吗，他们将可以发送信息给你？ + 屏蔽 %s 中的所有联系人？ + 解除对 %s 中所有联系人的屏蔽？ + 联系人已屏蔽 + 从书签中移除 %s ？相关会话消息不会被清除 . 在服务器上注册新账户 + 在服务器上改变密码 分享 开始会话 邀请联系人 联系人 取消 + 设置 添加 编辑 删除 + 屏蔽 + 解除屏蔽 保存 完成 - Conversations停止运行 - 发送堆栈跟踪到正在开发Conversations的人员\n警告: 该操作将用您的 XMPP账户发送堆栈跟踪到开发人员. + Conversations 崩溃 + 发送堆栈跟踪信息到 Conversations 的开发人员\n警告: 该操作将用您的 XMPP 账户发送堆栈跟踪给开发人员。 现在发送 不再询问 无法连接至账户 无法连接至多个账户 点击此处管理账户 - 附件 - 该联系人不在您的列表.需要加为联系人吗 ? + 附加文件 + 该联系人不在您的列表。需要加为联系人吗 ? 添加联系人 传递失败 拒绝 准备传输图像 清除历史记录 清除会话记录 - 删除该会话中所有信息?\n\n注: 该操作不会影响其他设备或服务器保存的信息. + 删除该会话中所有信息？\n\n注: 该操作不会影响其他设备或服务器保存的信息。 删除消息 之后结束该会话 添加在线用户至联系人 发送纯文本信息 发送 OTR 加密信息 发送 OpenPGP 加密信息 - 用户名修改成功 + 昵称修改成功 下载图片 不加密发送 - 解密失败，可能是私钥不正确. + 解密失败，可能是私钥不正确。 OpenKeychain - 会话运用了第三方app，名为 OpenKeychain 用来加密、解码信息以及管理您的公钥.\n\nOpenKeychain 遵循 GPLv3 并且在 F-Droid和Google Play上可操作.\n\n(之后请重启conversations.) + 会话运用了第三方app，名为 OpenKeychain 用来加密、解密信息以及管理您的密钥。\n\nOpenKeychain 遵循 GPLv3 并且可以在 F-Droid 和 Google Play 上获取。\n\n(之后请重启 conversations) 重启 安装 输入… 等待… - 未发现OpenPGP 密码 - 会话加密信息失败，因为联系人未告知他/她的公钥.\n\n请通知联系人设置 OpenPGP. - 未找到 OpenPGP 密码 + 未发现 OpenPGP 密钥 + 会话加密信息失败，因为联系人未提供他/她的公钥。\n\n请通知联系人设置 OpenPGP。 + 未找到 OpenPGP 密钥 因您的联系人未公布公钥，Conversations未能成功加密您的信息.\n\n请通知联系人设置OpenPGP. - 加密信息已接收.点击进行解密和查看. + 加密信息已接收。点击解密并查看。 常规 XMPP 资源 客户端标识名称 @@ -91,41 +105,41 @@ 震动 收到新消息时震动 声音 - 收到新消息时播放铃声 + 收到新消息时的铃声 讨论组通知 当有新的消息时总是通知而不是亮屏时才通知 通知限期 接收副本短时间内关闭通知 高级选项 - 总不发送故障报告 - 发送堆栈跟踪帮助Conversations开发人员 + 总不发送崩溃报告 + 发送堆栈跟踪帮助 Conversations 开发人员 确认消息 当你已收到消息并且已阅时通知好友 - UI选项 + UI 选项 OpenKeychain 报告了一个错误 - 解码文件时出现I/O错误 + 解密文件时出现 I/O 错误 接受 产生了一个错误 同意更新在线联系人 - 预先同意并请求您的联系人进行更新 + 预先同意并请求更新您的联系人 关注 你的账号 - Keys - 发送在线联系人更新列表 - 接收在线联系人更新列表 - 请求在线联系人更新列表 + 密钥 + 发送在线联系人列表更新 + 接收在线联系人列表更新 + 请求在线联系人列表更新 选择图片 照相 预先同意订阅请求 您选择的文件不是图像文件 转换图像出错 未找到文件 - 常规的I/O错误.可能是存储空间不足的原因？ - 您用来选择图片的app没有给予足够权限支持我们读取文件.\n\n请使用另一文件管理器选择图片 + 常规的 I/O 错误。可能是存储空间不足？ + 您用来选择图片的 app 没有给予足够权限支持我们读取文件。\n\n请使用另一文件管理器选择图片 未知 暂时不可用 在线 - Connecting\u2026 + 连接中\u2026 离线 未授权 未找到服务器 @@ -134,6 +148,8 @@ 用户名已存在 注册完成 服务器不支持注册 + 安全错误 + 服务器不兼容 纯文本内容 OTR OpenPGP @@ -141,11 +157,11 @@ 删除账号 暂时不可用 发布头像 - 发布 OpenPGP 公共秘钥 + 发布 OpenPGP 公钥 启用账户 确定? 如果删除用户，所有会话信息将会丢失 - Record voice 录音 + 录音 Jabber ID 密码 username@example.com @@ -153,23 +169,28 @@ 密码 确认密码 密码不一致 - 该Jabber ID 无效 - 空间不足，图片过大 + 该 Jabber ID 无效 + 空间不足。图片过大 您将添加 %s 至手机联系人列表? 在线 - 免费对话 + 自由畅聊 离开 长时间离开 请勿打扰 离线 讨论组 其他成员 + 服务器信息 + XEP-0313: MAM XEP-0280: 消息碳 + XEP-0352: 客户端状态指示 + XEP-0191: 屏蔽指令 + XEP-0237: 花名册版本 XEP-0198: 流管理 XEP-0163: PEP (头像) 有效 无效 - 缺少公共秘钥公告 + 缺少公钥通知 最近一次查看为刚刚 最近一次查看为一分钟前 最近一次查看为 %d 分钟前 @@ -178,9 +199,9 @@ 最近一次查看为一天前 最近一次查看为 %d天前 未曾查看 - 加密信息. 请安装OpenKeychain进行解码. - 未知 OTR指纹 - OpenPGP 发现加密信息 + 加密信息. 请安装 OpenKeychain 以解密。 + 未知 OTR 指纹 + 发现 OpenPGP 加密信息 接收失败 你的指纹 OTR 指纹 @@ -192,6 +213,8 @@ 加入讨论组 删除联系人 查看联系人详细信息 + 屏蔽联系人 + 解除联系人屏蔽 创建 联系人已存在 加入 @@ -200,26 +223,26 @@ 保存为书签 删除书签 该书签已存在 - 你的 + 你 编辑讨论组主题 讨论组未找到 离开 联系人已添加你到联系人列表 反向添加 - 目前读到%s 处 + 目前读到 %s 处 发布 - 点击头像可选择头像 - 请注意: 所有关注您最新动态的人将看到该图像. - 发布… + 点击头像可从相册中选择头像 + 请注意: 所有关注您最新动态的人将看到该图像。 + 正在发布… 服务器拒绝了您的发布请求 - 转换头像出错 - 不能将头像保存至disk + 转换头像图片出错 + 不能将头像保存至磁盘 (或长按按钮将返回默认头像) 您的服务器不支持发布头像 密谈 至 %s - 发送私密消息到%s - Connect + 发送私密消息到 %s + 连接 该账号已存在 下一步 当前会话已建立 @@ -232,21 +255,193 @@ 讨论组设有密码 输入密码 缺少在线联系人更新 - 请先发送更新在线联系人请求.\n\n这将用来判断您的联系人所用的客户端类型人. + 请先发送更新在线联系人的请求。\n\n以判断您的联系人所用的客户端类型。 现在发送请求 删除指纹 是否确定删除该指纹? 忽略 - 警告:在没有相互更新在线联系人的情况下发送将会出现未知问题.\n\n到联系人详情确认您订阅的在线联系人. + 警告:在没有相互更新在线联系人的情况下发送将会出现未知问题。\n\n前往联系人详情以验证您订阅的在线联系人。 加密设置 - 强制要求 end-to-end 加密 + 强制要求端对端加密 总是发送加密信息(讨论组信息除外) 不保存加密信息 警告:此操作将会导致信息丢失 - Expert 选项 + 导出选项 请谨慎使用 + 关于 Conversations + 构建及许可证信息 + 静默时间段 + 开始时间 + 结束时间 + 启用静默时间段 + 在静默时间段内通知将保持静音 放大字体 - 整个app界面使用更大号的字体 + 整个 app 界面使用较大的字体 发送按钮显示状态 + 请求消息回复 + 如果支持消息将会以绿色对勾标识 发送按钮采用其他颜色以示发送状态的区别 + 其他 + 讨论组名称 + 用讨论组的主题来标示讨论组而不是 JID + OTR 指纹已拷贝到剪贴板！ + 你被此讨论组屏蔽 + 此讨论组只允许成员加入 + 你被从此讨论组踢出 + 用账户 %s + 正在 HTTP 托管中检查图片 + 此图片已经被删除 + 你没有连接。请稍后重试 + 检查图片文件尺寸 + 消息选项 + 拷贝文本 + 拷贝原始URL + 再次发送 + 图片 URL + 消息文本 + 已经拷贝 URL 到剪贴板 + 消息已经拷贝到剪贴板 + 图片传送失败 + 扫描二维码 + 显示二维码 + 显示屏蔽列表 + 账户详情 + 验证 OTR + 远程指纹 + 扫描 + (或轻触手机) + Socialist Millionaire Protocol + 提示或问题 + 共知的秘密 + 确认 + 处理中 + 回应 + 失败 + 秘密不符 + 再试一遍 + 完成 + 验证通过！ + 联系人请求 SMP 验证 + 没有找到 OTR 会话 + Conversations + 保持前台服务 + 防止操作系统中断你的连接 + 关闭文件 + 接收中 %1$s (已完成 %2$d%%) + 下载 %s + 文件 + 打开 %s + 发送中 (已完成 %1$d%%) + 准备传送文件 + 可以下载 %s + 取消传送 + 文件传送失败 + 文件已经删除 + 没有可以打开此文件的应用 + 不能验证指纹 + 手工验证 + 你确认验证你的联系人的 OTR 指纹？ + 现实动态标签 + 在联系人下方显示只读标签 + 启用通知 + 与…创建讨论组 + 无法找到讨论组服务器 + 讨论组创建失败！ + 讨论组已创建！ + 秘密被接受！ + 重置 + 账户头像 + 拷贝 OTR 指纹到剪贴板 + 从服务器获取历史记录 + 服务器上没有更多历史记录 + 更新中… + 密码已修改！ + 不能修改密码 + 要启动加密聊天先发送一条消息 + 提出问题 + 如果你和你的联系人有一个共知的秘密(比如一个内部笑话或者仅仅只是上次见面时吃的午餐) 你可以使用这个秘密来验证彼此的指纹。\n\n你的联系人将以大小写敏感的方式给出答案，你可以给出提示或问题。 + 你的联系人可以通过一个你们共知的秘密来验证指纹。你的联系人给出了如下的提示或问题。 + 你的提示不能为空 + 你共知的秘密不能为空 + 请仔细核对下面显示出来的你的联系人的指纹。\n你可以使用任何可信赖的联系方式，比如加密邮件或电话，来交换这些指纹信息。 + 修改密码 + 当前密码 + 新密码 + 密码不能为空 + 启用所有账户 + 禁用所有账户 + 做一个动作和 + 没有从属关系 + 没有角色 + 抛弃 + 成员 + 高级模式 + 已授予的成员 + 吊销的成员 + 授予管理员权限 + 吊销管理员权限 + 从讨论组移出 + 不能修改 %s 的从属关系 + 屏蔽出讨论组 + 你正尝试将 %s 移出一个公共的讨论组。唯一的方式是永远屏蔽这个用户 + 现在屏蔽 + 不能修改 %s 的角色 + 公开访问的讨论组 + 私密，只有成员可以加入的讨论组 + 讨论组选项 + 私密(只对成员开放) + 非匿名 + 讨论组选项已修改！ + 不能修改讨论组选项 + 从不 + 30 分钟 + 1 个小时 + 2 个小时 + 8 个小时 + 直到新的通知 + 输入选项 + 回车是发送 + 用回车键来发送消息 + 显示回车键 + 改变表情键为回车键 + 音频 + 视频 + 图像 + PDF 文档 + Android App + 联系人 + 已经收到 %s + 禁用前端服务 + 轻触打开 Conversations + 头像已经发布！ + 发送中 %s + 提供中 %s + 隐藏离线联系人 + 禁用账户 + %s 正在输入… + %s 已停止输入 + 键盘输入通知 + 让对方知道你正在输入新消息 + 发送位置 + 显示位置 + 无法找到显示位置的应用 + 位置 + 位置已收到 + Conversation 已关闭 + 离开讨论组 + 证书选项 + 不相信系统 CA + 所有证书必须人工通过 + 移除证书 + 删除人工通过的证书 + 没有人工通过的证书 + 移除证书 + 删除选项 + 取消 + + %d 个证书已被删除 + + + 选择 %d 个联系人 + -- cgit v1.2.3 From a4ec7a7df1b840e52d56bc7b31c629a0e96b6fc5 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 20 May 2015 12:26:38 +0200 Subject: pulled translations from transifex --- src/main/res/values-bg/strings.xml | 5 +++++ src/main/res/values-de/strings.xml | 5 +++++ src/main/res/values-id/strings.xml | 5 +++++ src/main/res/values-nl/strings.xml | 5 +++++ src/main/res/values-pl/strings.xml | 5 +++++ src/main/res/values-sr/strings.xml | 5 +++++ src/main/res/values-sv/strings.xml | 5 +++++ 7 files changed, 35 insertions(+) (limited to 'src/main/res') diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml index b27481dd..52bb0054 100644 --- a/src/main/res/values-bg/strings.xml +++ b/src/main/res/values-bg/strings.xml @@ -446,4 +446,9 @@ Изберете %d контакт Изберете %d контакта + Замяна на бутона за изпращане с бързо действие + Бързо действие + Нищо + Използвани наскоро + Изберете бързо действие diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 08b0d4a5..000c253b 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -446,4 +446,9 @@ %d Kontakt ausgewählt %d Kontakte ausgewählt + Ersetze Absende-Knopf durch Schnell-Tasten + Schnell-Tasten + keine + zuletzt verwendet + wähle Schnell-Taste diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml index 69bd0911..3ce9cc82 100644 --- a/src/main/res/values-id/strings.xml +++ b/src/main/res/values-id/strings.xml @@ -444,4 +444,9 @@ Pilih %d kontak + Timpa tombol kirim dengan aksi cepat + Aksi Cepat + Tak satupun + Maling sering digunakan + Pilih aksi cepat diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index 2532130d..e3f0e69b 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -446,4 +446,9 @@ Selecteer %d contact Selecteer %d contacten + Vervang verzendknop door snelle actie + Snelle actie + Geen + Recent gebruikt + Kies snelle actie diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 70c3a49d..6a983f50 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -448,4 +448,9 @@ %d kontakty wybrane %d kontaktów wybranych + Zastąp przycisk wysyłania szybką akcją + Szybka akcja + Brak + Ostatnio używana + Wybierz szybką akcję diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml index ea5cbdb8..60f2e586 100644 --- a/src/main/res/values-sr/strings.xml +++ b/src/main/res/values-sr/strings.xml @@ -448,4 +448,9 @@ Изабери %d контакта Изабери %d контаката + Замени дугме за слање брзом радњом + Брза радња + Ниједна + Недавно коришћена + Изаберите брзу радњу diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index 4f84110b..9c60db53 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -446,4 +446,9 @@ Välj %d kontakt Välj %d kontakter + Byt sänd-knappen mot snabbfunktion + Snabbfunktion + Ingen + Senast använd + Välj snabbfunktion -- cgit v1.2.3 From 997b11dbecc6023ad0679843d8a267d843a2951c Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 26 May 2015 05:34:58 +0200 Subject: added choose picture as another quick action. fixes #1221 --- src/main/res/drawable-hdpi/ic_send_picture_away.png | Bin 0 -> 790 bytes src/main/res/drawable-hdpi/ic_send_picture_dnd.png | Bin 0 -> 884 bytes src/main/res/drawable-hdpi/ic_send_picture_offline.png | Bin 0 -> 657 bytes src/main/res/drawable-hdpi/ic_send_picture_online.png | Bin 0 -> 867 bytes src/main/res/drawable-mdpi/ic_send_picture_away.png | Bin 0 -> 512 bytes src/main/res/drawable-mdpi/ic_send_picture_dnd.png | Bin 0 -> 585 bytes src/main/res/drawable-mdpi/ic_send_picture_offline.png | Bin 0 -> 456 bytes src/main/res/drawable-mdpi/ic_send_picture_online.png | Bin 0 -> 580 bytes src/main/res/drawable-xhdpi/ic_send_picture_away.png | Bin 0 -> 899 bytes src/main/res/drawable-xhdpi/ic_send_picture_dnd.png | Bin 0 -> 1016 bytes src/main/res/drawable-xhdpi/ic_send_picture_offline.png | Bin 0 -> 799 bytes src/main/res/drawable-xhdpi/ic_send_picture_online.png | Bin 0 -> 997 bytes src/main/res/drawable-xxhdpi/ic_send_picture_away.png | Bin 0 -> 1327 bytes src/main/res/drawable-xxhdpi/ic_send_picture_dnd.png | Bin 0 -> 1516 bytes src/main/res/drawable-xxhdpi/ic_send_picture_offline.png | Bin 0 -> 1159 bytes src/main/res/drawable-xxhdpi/ic_send_picture_online.png | Bin 0 -> 1493 bytes src/main/res/drawable-xxxhdpi/ic_send_picture_away.png | Bin 0 -> 1632 bytes src/main/res/drawable-xxxhdpi/ic_send_picture_dnd.png | Bin 0 -> 1784 bytes .../res/drawable-xxxhdpi/ic_send_picture_offline.png | Bin 0 -> 1428 bytes src/main/res/drawable-xxxhdpi/ic_send_picture_online.png | Bin 0 -> 1800 bytes src/main/res/values/arrays.xml | 2 ++ 21 files changed, 2 insertions(+) create mode 100644 src/main/res/drawable-hdpi/ic_send_picture_away.png create mode 100644 src/main/res/drawable-hdpi/ic_send_picture_dnd.png create mode 100644 src/main/res/drawable-hdpi/ic_send_picture_offline.png create mode 100644 src/main/res/drawable-hdpi/ic_send_picture_online.png create mode 100644 src/main/res/drawable-mdpi/ic_send_picture_away.png create mode 100644 src/main/res/drawable-mdpi/ic_send_picture_dnd.png create mode 100644 src/main/res/drawable-mdpi/ic_send_picture_offline.png create mode 100644 src/main/res/drawable-mdpi/ic_send_picture_online.png create mode 100644 src/main/res/drawable-xhdpi/ic_send_picture_away.png create mode 100644 src/main/res/drawable-xhdpi/ic_send_picture_dnd.png create mode 100644 src/main/res/drawable-xhdpi/ic_send_picture_offline.png create mode 100644 src/main/res/drawable-xhdpi/ic_send_picture_online.png create mode 100644 src/main/res/drawable-xxhdpi/ic_send_picture_away.png create mode 100644 src/main/res/drawable-xxhdpi/ic_send_picture_dnd.png create mode 100644 src/main/res/drawable-xxhdpi/ic_send_picture_offline.png create mode 100644 src/main/res/drawable-xxhdpi/ic_send_picture_online.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_send_picture_away.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_send_picture_dnd.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_send_picture_offline.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_send_picture_online.png (limited to 'src/main/res') diff --git a/src/main/res/drawable-hdpi/ic_send_picture_away.png b/src/main/res/drawable-hdpi/ic_send_picture_away.png new file mode 100644 index 00000000..09d1c7b7 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_picture_away.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_picture_dnd.png b/src/main/res/drawable-hdpi/ic_send_picture_dnd.png new file mode 100644 index 00000000..77964b5b Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_picture_dnd.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_picture_offline.png b/src/main/res/drawable-hdpi/ic_send_picture_offline.png new file mode 100644 index 00000000..28135e25 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_picture_offline.png differ diff --git a/src/main/res/drawable-hdpi/ic_send_picture_online.png b/src/main/res/drawable-hdpi/ic_send_picture_online.png new file mode 100644 index 00000000..feb926c6 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_picture_online.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_picture_away.png b/src/main/res/drawable-mdpi/ic_send_picture_away.png new file mode 100644 index 00000000..d3ebca53 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_picture_away.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_picture_dnd.png b/src/main/res/drawable-mdpi/ic_send_picture_dnd.png new file mode 100644 index 00000000..1d293f20 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_picture_dnd.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_picture_offline.png b/src/main/res/drawable-mdpi/ic_send_picture_offline.png new file mode 100644 index 00000000..95d5621e Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_picture_offline.png differ diff --git a/src/main/res/drawable-mdpi/ic_send_picture_online.png b/src/main/res/drawable-mdpi/ic_send_picture_online.png new file mode 100644 index 00000000..be4194d3 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_picture_online.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_picture_away.png b/src/main/res/drawable-xhdpi/ic_send_picture_away.png new file mode 100644 index 00000000..f9aa21dc Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_picture_away.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_picture_dnd.png b/src/main/res/drawable-xhdpi/ic_send_picture_dnd.png new file mode 100644 index 00000000..95e4acce Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_picture_dnd.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_picture_offline.png b/src/main/res/drawable-xhdpi/ic_send_picture_offline.png new file mode 100644 index 00000000..75ff2fc4 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_picture_offline.png differ diff --git a/src/main/res/drawable-xhdpi/ic_send_picture_online.png b/src/main/res/drawable-xhdpi/ic_send_picture_online.png new file mode 100644 index 00000000..0f68d5f5 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_picture_online.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_picture_away.png b/src/main/res/drawable-xxhdpi/ic_send_picture_away.png new file mode 100644 index 00000000..7898ed4f Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_picture_away.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_picture_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_picture_dnd.png new file mode 100644 index 00000000..ccffabbe Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_picture_dnd.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_picture_offline.png b/src/main/res/drawable-xxhdpi/ic_send_picture_offline.png new file mode 100644 index 00000000..7b5687e4 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_picture_offline.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_send_picture_online.png b/src/main/res/drawable-xxhdpi/ic_send_picture_online.png new file mode 100644 index 00000000..82eab70c Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_picture_online.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_picture_away.png b/src/main/res/drawable-xxxhdpi/ic_send_picture_away.png new file mode 100644 index 00000000..1daa8ecc Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_picture_away.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_picture_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_picture_dnd.png new file mode 100644 index 00000000..d8257aad Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_picture_dnd.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_picture_offline.png b/src/main/res/drawable-xxxhdpi/ic_send_picture_offline.png new file mode 100644 index 00000000..d487709b Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_picture_offline.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_send_picture_online.png b/src/main/res/drawable-xxxhdpi/ic_send_picture_online.png new file mode 100644 index 00000000..c095d795 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_picture_online.png differ diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index fec077cc..5be352d1 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -44,6 +44,7 @@ @string/none @string/recently_used @string/attach_take_picture + @string/attach_choose_picture @string/attach_record_voice @string/send_location @@ -52,6 +53,7 @@ none recent photo + picture voice location -- cgit v1.2.3 From a423fc04facb5590998ebde98a7fc3b3edb163ba Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 26 May 2015 11:09:17 +0200 Subject: pulled translations from transifex --- src/main/res/values-cs/strings.xml | 5 +++++ src/main/res/values-es/strings.xml | 5 +++++ src/main/res/values-eu/strings.xml | 5 +++++ src/main/res/values-ja/strings.xml | 5 +++++ 4 files changed, 20 insertions(+) (limited to 'src/main/res') diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index f49cb1b9..c199ec76 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -448,4 +448,9 @@ Vybrat %d kontakty Vybrat %d kontaktů + Nahradit tlačítko odeslání rychlou akcí + Rychlá akce + Žádná + Naposledy použitá + Vybrat rychlou akci diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 109715e3..880ee66b 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -446,4 +446,9 @@ Seleccionado %d contacto Seleccionados %d contactos + Cambiar el botón de enviar por botón de acción rápida + Acción Rápida + Ninguna + Usada más recientemente + Elegir acción rápida diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index ac66bfc1..b594c069 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -446,4 +446,9 @@ Hautatu kontaktu %d Hautatu %d kontaktu + Bidaltze botoia ekintza azkar batekin aldatu + Ekintza azkarra + Bat ere ez + Azkenengo aldiz erabilitakoa + Ekintza azkarra aukeratu diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index 35fb5472..38735f39 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -444,4 +444,9 @@ %d 連絡先を選択 + 送信ボタンをクイックアクションで置き換えます + クイックアクション + なし + 最近使用した + クイックアクションの選択 -- cgit v1.2.3 From b40922d7475249e07af77aacd68f39cfd4dd3859 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 2 Jun 2015 14:10:49 +0200 Subject: upgrade build tools --- src/main/res/values-ca@valencia/strings.xml | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 src/main/res/values-ca@valencia/strings.xml (limited to 'src/main/res') diff --git a/src/main/res/values-ca@valencia/strings.xml b/src/main/res/values-ca@valencia/strings.xml deleted file mode 100644 index c757504a..00000000 --- a/src/main/res/values-ca@valencia/strings.xml +++ /dev/null @@ -1,2 +0,0 @@ - - -- cgit v1.2.3 From 0ea83832cde4982d94cbee7b5779d0f32721fea0 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 10 Jun 2015 03:29:52 +0200 Subject: pulled new translations from transifex --- src/main/res/values-ko/strings.xml | 5 +++++ src/main/res/values-zh-rCN/strings.xml | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'src/main/res') diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index d00ab0fd..9354c432 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -444,4 +444,9 @@ %d 연락처 선택 + 전송 버튼을 빠른 동작 버튼으로 교체 + 빠른 동작 + 없음 + 최근 사용된 항목 + 빠른 동작 선택 diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index 2f80e064..e194bffd 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -444,4 +444,9 @@ 选择 %d 个联系人 + 以快速动作替代发送按钮 + 快速动作 + 无 + 最近使用过的 + 选择快速动作 -- cgit v1.2.3 From 35782636864f4567729b99b4a1c96d9495fcdab1 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 23 Jun 2015 12:19:33 +0200 Subject: pulled new translations from transifex --- src/main/res/values-ru/strings.xml | 5 +++++ src/main/res/values-sk/strings.xml | 18 +++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) (limited to 'src/main/res') diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 7b104820..7a57777b 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -450,4 +450,9 @@ Выбрано %d контактов + Заменить кнопку отправки кнопкой быстрого действия + Быстрое действие + Нет + Последнее выбранное + Выбрать быстрое действие diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index aa0fcff7..561f9824 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -110,7 +110,7 @@ Vždy upozorniť pri novej konferenčnej správe, nie len ak je zvýraznená Doba na prečítanie upozornenia Neupozorňovať krátko po obdržaní kópie správy - Pokročilé nastavenia + Rozšírené možnosti Neodosielať detaily o zlyhaní aplikácie Zaslaním detailov o dôvode zlyhania pomáhate ďalšiemu vývoju aplikácie Conversations Potvrdzovať správy @@ -266,7 +266,7 @@ Vždy zasielať šifrované správy (okrem skupinových konverzácií) Neukladať šifrované správy Varovanie: Toto môže viesť k strate správ - Expertné nastavenia + Expertné možnosti S týmto narábajte veľmi opatrne, prosím O Conversations Informácie o tvorbe a licencii @@ -375,7 +375,7 @@ Bez úlohy Vylúčený Člen - Pokročilý režim + Rozšírený režim Povoliť členstvo Odobrať členstvo Povoliť administrátorské výsady @@ -429,11 +429,23 @@ Prijatá poloha Konverzácia zatvorená Opustil skupinovú konverzáciu + Možnosti certifikátu Nedôverovať systému CAs Všetky certifikáty musia byť ručne schválené + Odstrániť certifikáty + Vymazať ručne schválené certifikáty + Žiadne ručne schválené certifikáty + Odstrániť certifikáty + Vymazať výber + Zrušiť Vybrať %d kontaktu Vybrať %d kontaktu Vybrať %d kontaktov + Nahradiť tlačidlo poslať rýchlou akciou + Rýchla akcia + Žiadny + Naposledy použitý + Vybrať rýchlu voľbu -- cgit v1.2.3 From f5ba9d4223ca8e5dc9ce00024f69a8374d170a31 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 2 Jul 2015 23:13:00 +0200 Subject: refactored message context menu --- src/main/res/menu/message_context.xml | 20 +++++++++++++------- src/main/res/values/strings.xml | 5 ++--- 2 files changed, 15 insertions(+), 10 deletions(-) (limited to 'src/main/res') diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml index 21659266..4e1316d3 100644 --- a/src/main/res/menu/message_context.xml +++ b/src/main/res/menu/message_context.xml @@ -3,21 +3,27 @@ + android:title="@string/copy_text" + android:visible="false"/> + android:title="@string/share_with" + android:visible="false"/> + android:title="@string/copy_original_url" + android:visible="false"/> + android:title="@string/send_again" + android:visible="false"/> + android:id="@+id/download_file" + android:title="@string/download_x_file" + android:visible="false"/> + android:title="@string/cancel_transmission" + android:visible="false"/> \ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 4631bd60..444d9ecf 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -82,7 +82,6 @@ Send OTR encrypted message Send OpenPGP encrypted message Your nickname has been changed - Download Image Send unencrypted Decryption failed. Maybe you don’t have the proper private key. OpenKeychain @@ -320,12 +319,12 @@ Checking image on HTTP host The image file has been deleted You are not connected. Try again later - Check image file size + Check %s size Message options Copy text Copy original URL Send again - Image URL + File URL Message text URL copied to clipboard Message copied to clipboard -- cgit v1.2.3 From 0f5c87ca1f3dc25e0f76ff1fa4308326d1d287f0 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 10 Jul 2015 13:28:50 +0200 Subject: display toast in ui on failed http download fixes #954 --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 444d9ecf..1af33587 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -478,4 +478,5 @@ None Most recently used Choose quick action + File not found on remote server -- cgit v1.2.3 From ffffca10f0c3e399fbbcde200ea4758acc5ba03f Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 13 Jul 2015 12:55:13 +0200 Subject: renamed colors --- src/main/res/drawable/es_slidingpane_shadow.xml | 2 +- src/main/res/drawable/grey.xml | 2 +- src/main/res/drawable/infocard_border.xml | 4 +- src/main/res/drawable/message_border.xml | 2 +- src/main/res/drawable/snackbar.xml | 2 +- .../fragment_conversations_overview.xml | 6 +- src/main/res/layout/account_row.xml | 4 +- src/main/res/layout/actionview_search.xml | 4 +- src/main/res/layout/activity_about.xml | 4 +- src/main/res/layout/activity_change_password.xml | 22 ++++---- src/main/res/layout/activity_contact_details.xml | 12 ++-- src/main/res/layout/activity_edit_account.xml | 64 +++++++++++----------- src/main/res/layout/activity_muc_details.xml | 12 ++-- .../layout/activity_publish_profile_picture.xml | 16 +++--- .../res/layout/activity_start_conversation.xml | 2 +- src/main/res/layout/activity_verify_otr.xml | 24 ++++---- src/main/res/layout/contact.xml | 6 +- src/main/res/layout/contact_key.xml | 4 +- src/main/res/layout/conversation_list_row.xml | 12 ++-- src/main/res/layout/create_contact_dialog.xml | 8 +-- src/main/res/layout/fragment_conversation.xml | 14 ++--- .../res/layout/fragment_conversations_overview.xml | 6 +- src/main/res/layout/join_conference_dialog.xml | 8 +-- src/main/res/layout/list_item_tag.xml | 2 +- src/main/res/layout/manage_accounts.xml | 4 +- src/main/res/layout/message_received.xml | 8 +-- src/main/res/layout/message_sent.xml | 8 +-- src/main/res/layout/message_status.xml | 2 +- src/main/res/layout/quickedit.xml | 2 +- src/main/res/values-v21/themes.xml | 4 +- src/main/res/values/colors.xml | 28 +++++----- src/main/res/values/strings.xml | 1 + src/main/res/values/styles.xml | 2 +- src/main/res/values/themes.xml | 4 +- 34 files changed, 153 insertions(+), 152 deletions(-) (limited to 'src/main/res') diff --git a/src/main/res/drawable/es_slidingpane_shadow.xml b/src/main/res/drawable/es_slidingpane_shadow.xml index 44ffd4ea..de96e08f 100644 --- a/src/main/res/drawable/es_slidingpane_shadow.xml +++ b/src/main/res/drawable/es_slidingpane_shadow.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/src/main/res/drawable/infocard_border.xml b/src/main/res/drawable/infocard_border.xml index 7c7ded57..e01e1442 100644 --- a/src/main/res/drawable/infocard_border.xml +++ b/src/main/res/drawable/infocard_border.xml @@ -1,13 +1,13 @@ - + + android:color="@color/black12" > - + \ No newline at end of file diff --git a/src/main/res/drawable/snackbar.xml b/src/main/res/drawable/snackbar.xml index 951d7aee..2645b136 100644 --- a/src/main/res/drawable/snackbar.xml +++ b/src/main/res/drawable/snackbar.xml @@ -1,7 +1,7 @@ - + diff --git a/src/main/res/layout-w945dp/fragment_conversations_overview.xml b/src/main/res/layout-w945dp/fragment_conversations_overview.xml index 50039c03..7ae1788d 100644 --- a/src/main/res/layout-w945dp/fragment_conversations_overview.xml +++ b/src/main/res/layout-w945dp/fragment_conversations_overview.xml @@ -9,15 +9,15 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" - android:background="@color/primarybackground" + android:background="@color/grey50" android:orientation="vertical" > diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml index 0e73dd64..06716a10 100644 --- a/src/main/res/layout/account_row.xml +++ b/src/main/res/layout/account_row.xml @@ -32,7 +32,7 @@ android:layout_height="wrap_content" android:scrollHorizontally="false" android:singleLine="true" - android:textColor="@color/primarytext" + android:textColor="@color/black87" android:textSize="?attr/TextSizeHeadline" /> diff --git a/src/main/res/layout/actionview_search.xml b/src/main/res/layout/actionview_search.xml index cc5fc9d7..8b657f4a 100644 --- a/src/main/res/layout/actionview_search.xml +++ b/src/main/res/layout/actionview_search.xml @@ -14,6 +14,8 @@ android:layout_height="wrap_content" android:focusable="true" android:inputType="textEmailAddress|textNoSuggestions" - android:textColor="@color/ondarktext" /> + android:textColor="@color/white" + android:textColorHint="@color/white70" + android:hint="@string/search_for_contacts_or_groups"/> \ No newline at end of file diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml index ab0e34eb..d7d23f0f 100644 --- a/src/main/res/layout/activity_about.xml +++ b/src/main/res/layout/activity_about.xml @@ -1,7 +1,7 @@ @@ -15,7 +15,7 @@ android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin" - android:textColor="@color/primarytext" + android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:typeface="monospace"/> diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml index 28d531c2..1a4d00d8 100644 --- a/src/main/res/layout/activity_change_password.xml +++ b/src/main/res/layout/activity_change_password.xml @@ -2,7 +2,7 @@ + android:background="@color/grey50"> @@ -94,7 +94,7 @@ android:layout_height="fill_parent" android:layout_marginBottom="7dp" android:layout_marginTop="7dp" - android:background="@color/divider"/> + android:background="@color/black12"/>