Merge pull request #3 from guardianproject/master

update master
guardianproject · Jan 6, 2018 · f522de6 · f522de6
2 parents b654559 + 79b5293
commit f522de6
Show file tree

Hide file tree

Showing 5 changed files with 105 additions and 54 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ Learn more about the story of this project at the links below:
 
 ## Project Team
 
-Haven was developed through a collaboration between [Freedom of the Press Foundation](https://freedom.press) and [Guardian Project](https://guardianproject.info). Prototype funding was generously provided by FoPF, and donations to support continuing work can be contributed through their site: https://freedom.press/donate-support-haven-open-source-project/
+Haven was developed through a collaboration between [Freedom of the Press Foundation](https://freedom.press) and [Guardian Project](https://guardianproject.info). Prototype funding was generously provided by FPF, and donations to support continuing work can be contributed through their site: https://freedom.press/donate-support-haven-open-source-project/
 
 ![Freedom of the Press Foundation](https://raw.githubusercontent.com/guardianproject/haven/master/art/logos/fopflogo.png)
 ![Guardian Project](https://raw.githubusercontent.com/guardianproject/haven/master/art/logos/gplogo.png)

diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+education, socio-economic status, nationality, personal appearance, race,
+religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [email protected]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
diff --git a/fastlane/android/metadata/en-US/full_description.txt b/fastlane/android/metadata/en-US/full_description.txt
@@ -15,7 +15,7 @@ Project Team
 
 Haven was developed through a collaboration between Freedom of the
 Press Foundation and Guardian Project. Prototype funding was
-generously provided by FoPF, and donations to support continuing work
+generously provided by FPF, and donations to support continuing work
 can be contributed through their site:
 https://freedom.press/donate-support-haven-open-source-project
 

diff --git a/src/main/res/layout/custom_slide_notify.xml b/src/main/res/layout/custom_slide_notify.xml
@@ -23,7 +23,7 @@
         android:layout_height="wrap_content"
         android:textColor="@color/White"
         android:backgroundTint="@color/colorPrimaryLight"
-        android:hint="+12125551212"
+        android:hint="@string/sms_hint"
         android:gravity="center"
         android:inputType="phone"
         android:id="@+id/editNumber"

diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
@@ -1,11 +1,8 @@
 <resources>
 
-    <string name="app_name">Haven</string>
 
-    <string name="menu_stop">停止</string>
-    <string name="menu_start">開始</string>
+
     <string name="menu_save">保存</string>
-    <string name="menu_remote_access">リモート接続</string>
     <string name="menu_about">設定...</string>
 
     <string name="title_activity_start">Haven</string>
@@ -18,63 +15,24 @@
     	音の感度
     </string>
 
-    <string name="camera_sensitivity">
-    	カメラモーション感度
-    </string>
-
     <string name="timer_delay_label">
     	開始遅延時間
     </string>
 
-    <string name="microphone_label">
-    	マイクを使って音を検出する
-    </string>
-
-    <string name="camera_label">
-    	カメラ選択
-    </string>
-
-    <string name="flash_label">
-    	フラッシュを有効
-    </string>
-
     <string name="sms_label">
     	ショートメールで警告を送信
     </string>
 
     <string name="sms_hint">
-    	08012345678
-    </string>
-
-    <string name="unlock_code_hint">
-        解除コード
-    </string>
-
-    <string name="start_button">
-    	開始
+    	+818012345678
     </string>
 
     <string name="camera_prompt">
     	カメラ選択
     </string>
 
-    <array name="select_sensitivity">
-        <item>低</item>
-        <item>中</item>
-        <item>高</item>
-        <item>オフ</item>
-    </array>
-    <array name="select_camera">
-        <item>前面カメラ</item>
-        <item>背面カメラ</item>
-        <item>オフ</item>
-
-    </array>
-
     <string name="secure_service_started">Haven 起動</string>
 
-    <string name="secure_service_stopped">Haven 停止</string>
-
     <string name="intrusion_detected">(Type: %s) センサーがトリガされた</string>
     <string name="title_activity_event">イベントアクティビティ</string>
 
@@ -86,15 +44,14 @@
     <string name="intro2_title">Havenは自宅や会社、ホテルルーム、その他プライベート空間への進入を見張りたい人の為のものです。</string>
     <string name="intro3_desc">余っている携帯電話を、動き、音、振動、光センサーに変えて、招かれざる客や望まない侵入者を監視します</string>
 
-    <string name="sensor_setup_info">カメラを撮影角度に合わせるか、電話を隠れた場所に置き、騒音を聞く</string>
-
     <string name="intro4_desc">直ちに侵入の通知を受け、そして、後からログをリモートや直接に確認します</string>
 
     <string name="intro5_title">Havenは準備完了</string>
     <string name="intro5_desc">メインスクリーンの &gt; を押す事で何時でもアプリを有効にします</string>
 
     <string name="onboarding_action_end">完了</string>
 
+    <string name="remote_access">リモートアクセス</string>
     <string name="remote_access_label">Tor Onion Service経由のリモートアクセスを有効にする</string>
     <string name="remote_access_hint">Onion service address from Orbot</string>
     <string name="remote_access_credential_hint">リモートパスワードを設定</string>
@@ -109,7 +66,7 @@
     <string name="current_noise_base">現在のノイズレベル</string>
     <string name="current_accel_base">現在のモーションレベル</string>
 
-    <string name="configure_trigger_level">ホイールをスワイプして検出の閾値を変更します</string>
+    <string name="configure_trigger_level">スライド操作で検出の閾値を変更します</string>
     <string name="tune_the_sound_detection">何かノイズを出して！</string>
     <string name="set_your_phone_on_the_table_and_make_noises_in_the_room_to_find_the_right_level_to_detect">携帯を机の上に置き、部屋で何らかの騒音を出す事で、適切な騒音レベルを見つける事が出来ます</string>
 
@@ -137,18 +94,38 @@
     <string name="verify">ベリファイ</string>
     <string name="register">登録</string>
     <string name="activate_signal">シグナルを有効にする</string>
-    <string name="verify_signal">シグナルを確認する</string>
-    <string name="enter_verification">シグナル登録手続きから受け取った確認コードを入力してください</string>
+    <string name="verify_signal">シグナルのベリファイ</string>
+    <string name="enter_verification">シグナル登録手続きから受け取った確認コードを入力してください（6桁の数字）</string>
     <string name="cancel">取消</string>
     <string name="register_title">シグナルを登録</string>
-    <string name="register_signal_desc">新しい電話番号でシグナルに署名してセキュリティ通知を送信します。 あなたの現在またはメインのシグナル番号を使用しないでください。</string>
-    <string name="phone_hint">08012345678</string>
+    <string name="register_signal_desc">信号に登録する電話番号を入力して、セキュアな通知を送信するために使用します。このデバイスの携帯番号、または、仮想の番号を設定する事が出来ます。\n\n警告：この番号が Signalアプリのインストールで既に設定されている場合は、その動作が停止します。そして、Havenアプリ内でのみ機能します。</string>
+    <string name="phone_hint">+818012345678</string>
 
     <string name="menu_licenses">ライセンス...</string>
     <string name="sensor_light">環境光</string>
     <string name="sensor_accel">動き (加速度計)</string>
     <string name="sensor_camera">モーション (カメラ)</string>
     <string name="sensor_sound">マイク</string>
     <string name="sensor_power">USB電源</string>
+    <string name="sensor_bump">衝撃 (加速度計)</string>
     <string name="sensor_unknown">不明</string>
+
+    <string name="settings">設定</string>
+    <string name="remote_access_onion_error">この機能は the Orbot: Tor for Android appのインストールが必要です。</string>
+
+    <!--Preference Settings -->
+    <string name="hint_number" translatable="false">+818012345678</string>
+    <string name="sms_dialog_summary">警告を送信する携帯番号を入力</string>
+    <string name="sms_dialog_message">警告を送信する携帯番号を入力</string>
+    <string name="signal_dialog_summary">シグナルから使用する携帯番号</string>
+    <string name="verification_dialog_summary">シグナル番号の確認コードを入力</string>
+    <string name="send_message_dialog">テスト用の警告通知メッセージを送信する携帯番号を入力</string>
+    <string name="send_text_message">テストの通知...</string>
+    <string name="service_address">サービスアドレス</string>
+    <string name="password">パスワード</string>
+    <string name="signal_number">シグナル番号(ローカル)</string>
+    <string name="phone_number">通知番号(リモート)</string>
+    <string name="sensors">センサー</string>
+    <string name="label_notifications">通知</string>
+
 </resources>