Merge remote-tracking branch 'origin/master' into GeneratorRework
# Conflicts: # app/app.iml
This commit is contained in:
Christopher Beckmann
commit
3d91bc1487
4 changed files with 155 additions and 123 deletions
25
CHANGELOG.md
Normal file
25
CHANGELOG.md
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
Changelog
|
||||
==========
|
||||
|
||||
Version 2.0.1 *(2016-11-07)*
|
||||
----------------------------
|
||||
|
||||
* Splash Screen added
|
||||
|
||||
Version 2.0 *(2016-10-15)*
|
||||
----------------------------
|
||||
|
||||
* Optimization of the level generator to save battery life
|
||||
* Design-Update
|
||||
* New Logo
|
||||
* French translation updated
|
||||
|
||||
Version 1.1 *(2016-03-29)*
|
||||
----------------------------
|
||||
|
||||
* French translation updated
|
||||
|
||||
Version 1.0 *(2016-03-22)*
|
||||
----------------------------
|
||||
|
||||
* Initial Release
|
||||
|
|
@ -11,9 +11,12 @@ It also does neither include advertisement nor tracking mechanisms.
|
|||
As it is part of the Privacy Friendly Apps developed by the SECUSO research group of the Technische
|
||||
Universtität Darmstadt in Germany it is optimized due to user's privacy.
|
||||
|
||||
|
||||
## Download and more Information
|
||||
|
||||
[<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="60">](https://f-droid.org/repository/browse/?fdfilter=sudoku&fdid=org.secuso.privacyfriendlysudoku)<a href="https://play.google.com/store/apps/details?id=org.secuso.privacyfriendlysudoku"><img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" height="60"></a>
|
||||
|
||||
### Building
|
||||
|
||||
Further development requires Android Studio, we recommend to use at least version 2.2.3
|
||||
|
||||
### API Reference
|
||||
|
|
|
|||
122
app/app.iml
122
app/app.iml
|
|
@ -1,122 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="privacy-friendly-sudoku" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="android-gradle" name="Android-Gradle">
|
||||
<configuration>
|
||||
<option name="GRADLE_PROJECT_PATH" value=":app" />
|
||||
</configuration>
|
||||
</facet>
|
||||
<facet type="android" name="Android">
|
||||
<configuration>
|
||||
<option name="SELECTED_BUILD_VARIANT" value="debug" />
|
||||
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
|
||||
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
|
||||
<afterSyncTasks>
|
||||
<task>generateDebugSources</task>
|
||||
</afterSyncTasks>
|
||||
<option name="ALLOW_USER_CONFIGURATION" value="false" />
|
||||
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
|
||||
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
|
||||
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
|
||||
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
|
||||
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
|
||||
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" exported="" name="support-annotations-25.0.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="design-25.0.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="support-v4-25.0.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="support-media-compat-25.0.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="support-v13-25.0.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="transition-25.0.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="support-compat-25.0.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="support-fragment-25.0.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="animated-vector-drawable-25.0.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="support-core-ui-25.0.0" level="project" />
|
||||
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
|
||||
<orderEntry type="library" exported="" name="appcompat-v7-25.0.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="support-vector-drawable-25.0.0" level="project" />
|
||||
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
|
||||
<orderEntry type="library" exported="" name="support-core-utils-25.0.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="recyclerview-v7-25.0.0" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
126
app/src/main/res/values-ja/strings.xml
Normal file
126
app/src/main/res/values-ja/strings.xml
Normal file
|
|
@ -0,0 +1,126 @@
|
|||
<resources>
|
||||
|
||||
<string name="cancel">キャンセル</string>
|
||||
|
||||
<!-- ###MAIN MENU### -->
|
||||
<string name="new_game">新しいゲーム</string>
|
||||
<string name="menu_main">メインメニュー</string>
|
||||
<string name="menu_settings">設定</string>
|
||||
<string name="menu_highscore">ハイスコア</string>
|
||||
<string name="menu_group">グループ</string>
|
||||
<string name="menu_help">ヘルプ</string>
|
||||
<string name="menu_about">アプリについて</string>
|
||||
<string name="menu_reset">ボードをリセット</string>
|
||||
<string name="menu_continue_game">ゲームを続ける</string>
|
||||
|
||||
<string name="title_activity_load_game">ゲームをロード</string>
|
||||
<string name="generating">バックグラウンドで新しいレベルを生成中…</string>
|
||||
|
||||
<!-- ###SETTINGS### -->
|
||||
<string name="title_activity_settings">設定</string>
|
||||
<!-- #Highlight -->
|
||||
<string name="pref_header_highlight">ハイライト</string>
|
||||
<string name="pref_group_highlight_selection">選択のハイライト</string>
|
||||
<string name="pref_highlight_connected">接続したフィールド</string>
|
||||
<string name="pref_group_highlight_value">数のハイライト</string>
|
||||
<string name="pref_highlight_vals">同じ数</string>
|
||||
<string name="pref_highlight_notes">メモ</string>
|
||||
<!-- #Game -->
|
||||
<string name="pref_header_game">ゲーム</string>
|
||||
<string name="pref_group_game">ゲーム設定</string>
|
||||
<string name="pref_symbols">シンボル</string>
|
||||
<array name="pref_symbols_list_titles">
|
||||
<item>デフォルト 1,2,3,..</item>
|
||||
<item>ローマ I,II,III,..</item>
|
||||
<item>ファンシー ♪,♫,☼,..</item>
|
||||
<item>漢字 一,二,三,..</item>
|
||||
<item>ギリシャ α,β,γ,..</item>
|
||||
<item>インド १,२,३,..</item>
|
||||
</array>
|
||||
<array name="pref_symbols_list_values">
|
||||
<item>Default</item>
|
||||
<item>Roman</item>
|
||||
<item>Fancy</item>
|
||||
<item>Chinese</item>
|
||||
<item>Greek</item>
|
||||
<item>Indian</item>
|
||||
</array>
|
||||
<string name="pref_automatic_note_deletion">メモの削除</string>
|
||||
<string name="pref_automatic_note_deletion_summary">接続されたセルの数をセットするときにメモを自動的に削除します</string>
|
||||
<string name="pref_timer_reset">タイマーリセット</string>
|
||||
<string name="pref_timer_reset_summary">ゲームボードをリセットするときに、タイマーもリセットします。</string>
|
||||
|
||||
<!-- ###ABOUT### -->
|
||||
<string name="about_author">作者:</string>
|
||||
<string name="about_author_contributors">と貢献者。</string>
|
||||
<string name="about_affiliation">提携</string>
|
||||
<string name="privacy_friendly">このアプリケーションは、ダルムシュタット工科大学 (Technische Universität Darmstadt, Germany) が開発したプライバシーフレンドリーアプリのグループに属しています。 ソースコードは GPLv3 の下でライセンスされます。画像の著作権は TU Darmstadt および Google Inc.</string>
|
||||
<string name="more_info">さらに詳しい情報は以下でご覧ください:</string>
|
||||
<string name="about_qqwing">このアプリケーションは QQWing v1.3.4 の修正版を使用しています</string>
|
||||
|
||||
<!-- ###GameDifficulty### -->
|
||||
<string name="difficulty_easy">簡単</string>
|
||||
<string name="difficulty_moderate">標準</string>
|
||||
<string name="difficulty_hard">難しい</string>
|
||||
|
||||
<!--###GameActivity -->
|
||||
<string name="gametype_unspecified">未指定</string>
|
||||
<string name="hint_usage">有効なフィールドを選択して、ヒントボタンを押すと、解決策を表示します。</string>
|
||||
<string name="hint_confirmation">このヒントを使用してもよろしいですか? ヒントを使用すると、個人のベストタイムを達成することができなくなります。</string>
|
||||
<string name="hint_confirmation_confirm">使用する</string>
|
||||
<string name="reset_confirmation">ゲームボードをリセットしてもよろしいですか?</string>
|
||||
<string name="reset_confirmation_confirm">リセット</string>
|
||||
|
||||
<!-- ### Welcome Dialog ### -->
|
||||
<string name="welcome">プライバシーフレンドリー Sudoku へようこそ。</string>
|
||||
<string name="field_select_description">スワイプまたは左右の矢印ボタンを押して、ゲームモードを変更します。</string>
|
||||
<string name="field_select_description_headline">ゲームモード:</string>
|
||||
<string name="difficulty_description">星を押すかスワイプして難易度を変えます。</string>
|
||||
<string name="difficulty_description_headline">難易度:</string>
|
||||
|
||||
<!-- ### Continue Game ### -->
|
||||
<string name="loadgame_delete_confirmation">このセーブを削除してもよろしいですか?</string>
|
||||
<string name="loadgame_delete_confirm">削除</string>
|
||||
|
||||
<!-- ### Stats ###-->
|
||||
<string name="stats_name">統計</string>
|
||||
<string name="number_of_hints"># 使用したヒント:</string>
|
||||
<string name="number_of_games"># 完了したゲーム:</string>
|
||||
<string name="total_of_time">合計プレイタイム:</string>
|
||||
<string name="average_time">平均タイム:</string>
|
||||
<string name="min_time">ベストタイム:</string>
|
||||
<string name="reset_stats">すべてリセット</string>
|
||||
|
||||
<!--### Win Strings -->
|
||||
<string name="win_text">おめでとう!</string>
|
||||
<string name="win_button_text">続ける</string>
|
||||
<string name="title_activity_help">ヘルプ</string>
|
||||
<string name="win_time">タイム:</string>
|
||||
<string name="win_hint">ヒント:</string>
|
||||
<string name="win_show_game">ゲームフィールドを表示</string>
|
||||
<string name="win_best_time">新記録!</string>
|
||||
|
||||
<!-- ### HELP prefs ###-->
|
||||
<string name="header_help">ヘルプ</string>
|
||||
<string name="help_keyboard">キーボード</string>
|
||||
<string name="help_gamefield">ゲームフィールド</string>
|
||||
<string name="help_keyhighlighted_summary">数が選択されていることを示します。 このモードでは、フィールドを選択しなくても、フィールドに触れると数がすぐにセットされます。</string>
|
||||
<string name="help_keyhighlighted_yellow_summary">ここに正しい数が置かれたことを示します。</string>
|
||||
|
||||
<!-- ### Special buttons description ###-->
|
||||
<string name="help_do">実行ボタン</string>
|
||||
<string name="help_do_summary">最後に取り消された操作をやり直します</string>
|
||||
<string name="help_undo">取り消しボタン</string>
|
||||
<string name="help_undo_summary">最後の操作を取り消します</string>
|
||||
<string name="help_hint">ヒントボタン</string>
|
||||
<string name="help_hint_summary">選択したフィールドを公開します\n警告: 使用すると、現在のゲームは新しいベストタイムにカウントされません。</string>
|
||||
<string name="help_delete">削除ボタン</string>
|
||||
<string name="help_delete_summary">選択したフィールドを削除します</string>
|
||||
<string name="help_notes">メモ切り替えボタン</string>
|
||||
<string name="help_notes_summary">フィールドの値を、数またはメモとしてセットするかどうかを切り替えます</string>
|
||||
<string name="help_privacyInfo">プライバシー情報</string>
|
||||
<string name="help_permissions">アクセス許可</string>
|
||||
<string name="help_permissions_summary">プライバシーフレンドリー Sudoku はいかなるアクセス許可も使用していません。</string>
|
||||
<string name="okay">OK</string>
|
||||
<string name="view_help">ヘルプを表示</string>
|
||||
</resources>
|
||||
Loading…
Reference in a new issue