diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index f0fbd9f19..869005886 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -4,122 +4,122 @@
     <string name="app_launcher_name">ギャラリー</string>
     <string name="edit">編集</string>
     <string name="open_camera">カメラを開く</string>
-    <string name="open_with">&#8230;で開く</string>
+    <string name="open_with">別のアプリで開く</string>
     <string name="no_app_found">有効なアプリが見つかりません</string>
     <string name="hidden">(非表示)</string>
-    <string name="pin_folder">Pin folder</string>
-    <string name="unpin_folder">Unpin folder</string>
-    <string name="show_all">Show all folders content</string>
-    <string name="all_folders">All media</string>
-    <string name="folder_view">Switch to folder view</string>
-    <string name="other_folder">Other folder</string>
-    <string name="show_on_map">Show on map</string>
-    <string name="unknown_location">Unknown location</string>
-    <string name="no_map_application">No application with maps has been found</string>
-    <string name="no_camera_app_found">No Camera app has been found</string>
-    <string name="increase_column_count">Increase column count</string>
-    <string name="reduce_column_count">Reduce column count</string>
-    <string name="change_cover_image">Change cover image</string>
-    <string name="select_photo">Select photo</string>
-    <string name="use_default">Use default</string>
-    <string name="set_as">Set as</string>
-    <string name="volume">Volume</string>
-    <string name="brightness">Brightness</string>
+    <string name="pin_folder">フォルダーをピン留めする</string>
+    <string name="unpin_folder">フォルダーのピン留めを外す</string>
+    <string name="show_all">すべてのフォルダーの内容を表示</string>
+    <string name="all_folders">すべてのフォルダー</string>
+    <string name="folder_view">フォルダーを選択する</string>
+    <string name="other_folder">その他のフォルダー</string>
+    <string name="show_on_map">地図で表示</string>
+    <string name="unknown_location">位置情報がありません</string>
+    <string name="no_map_application">地図アプリが見つかりません</string>
+    <string name="no_camera_app_found">カメラアプリが見つかりません</string>
+    <string name="increase_column_count">表示列数を増やす</string>
+    <string name="reduce_column_count">表示列数を減らす</string>
+    <string name="change_cover_image">カバー画像を変更</string>
+    <string name="select_photo">写真を選択</string>
+    <string name="use_default">デフォルトに戻す</string>
+    <string name="set_as">他で使う</string>
+    <string name="volume">音量</string>
+    <string name="brightness">明るさ</string>
 
     <!-- Filter -->
-    <string name="filter_media">Filter media</string>
-    <string name="images">Images</string>
-    <string name="videos">Videos</string>
-    <string name="gifs">GIFs</string>
-    <string name="no_media_with_filters">No media files have been found with the selected filters.</string>
-    <string name="change_filters_underlined"><u>Change filters</u></string>
+    <string name="filter_media">絞り込み</string>
+    <string name="images">画像</string>
+    <string name="videos">ビデオ</string>
+    <string name="gifs">GIF</string>
+    <string name="no_media_with_filters">絞り込み条件に該当するメディアがありません。</string>
+    <string name="change_filters_underlined"><u>絞り込み条件を変更</u></string>
 
     <!-- Hide / Exclude -->
-    <string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it, it will hide all subfolders too. You can see them by toggling the \'Show hidden folders\' option in Settings. Continue?</string>
-    <string name="exclude">Exclude</string>
-    <string name="excluded_folders">Excluded folders</string>
-    <string name="manage_excluded_folders">Manage excluded folders</string>
-    <string name="exclude_folder_description">This will exclude the selection together with its subfolders from Simple Gallery only. You can manage excluded folders in Settings.</string>
-    <string name="exclude_folder_parent">Exclude a parent instead?</string>
-    <string name="excluded_activity_placeholder">Excluding folders will make them together with their subfolders hidden just in Simple Gallery, they will still be visible in other applications.\\n\\nIf you want to hide them from other apps too, use the Hide function.</string>
-    <string name="remove_all">Remove all</string>
-    <string name="remove_all_description">Remove all folders from the list of excluded? This will not delete the folders.</string>
+    <string name="hide_folder_description">対象のフォルダーに「.nomedia」というファイルを作成し、フォルダーを非表示にします。そのフォルダー以下のすべてのサブフォルダーも、同様に非表示となります。非表示となったフォルダーを見るには、「設定」の中にある「非表示のフォルダーを表示」オプションを切り替えてください。このフォルダーを非表示にしますか？</string>
+    <string name="exclude">除外する</string>
+    <string name="excluded_folders">除外フォルダー</string>
+    <string name="manage_excluded_folders">除外フォルダーを管理</string>
+    <string name="exclude_folder_description">選択したフォルダーとそのサブフォルダーを、Simple Galleyの一覧から除外します。除外したフォルダーは「設定」で管理できます。</string>
+    <string name="exclude_folder_parent">親フォルダーを選択して除外することもできます。</string>
+    <string name="excluded_activity_placeholder">フォルダーを除外すると、サブフォルダーも含めSimple Galleyの一覧から除外します。他のアプリでは引き続き表示されます。\\n\\n他のアプリでも非表示にしたい場合は、「非表示」機能を使用してください。</string>
+    <string name="remove_all">すべて解除</string>
+    <string name="remove_all_description">除外するフォルダーの登録をすべて解除しますか? フォルダー自体は削除されません。</string>
 
     <!-- Include folders -->
-    <string name="include_folders">Included folders</string>
-    <string name="manage_included_folders">Manage included folders</string>
-    <string name="add_folder">Add folder</string>
-    <string name="included_activity_placeholder">If you have some folders which contain media, but were not recognized by the app, you can add them manually here.</string>
+    <string name="include_folders">追加フォルダー</string>
+    <string name="manage_included_folders">追加フォルダーを管理</string>
+    <string name="add_folder">フォルダーを追加</string>
+    <string name="included_activity_placeholder">メディアを含んでいるフォルダーがアプリから認識されていない場合は、手動で追加できます。</string>
 
     <!-- Resizing -->
-    <string name="resize">Resize</string>
-    <string name="resize_and_save">Resize selection and save</string>
-    <string name="width">Width</string>
-    <string name="height">Height</string>
-    <string name="keep_aspect_ratio">Keep aspect ratio</string>
-    <string name="invalid_values">Please enter a valid resolution</string>
+    <string name="resize">リサイズ</string>
+    <string name="resize_and_save">選択領域をリサイズして保存</string>
+    <string name="width">幅</string>
+    <string name="height">高さ</string>
+    <string name="keep_aspect_ratio">縦横比を固定</string>
+    <string name="invalid_values">解像度を正しく入力してください</string>
 
     <!-- Editor -->
     <string name="editor">エディター</string>
     <string name="save">保存</string>
     <string name="rotate">回転</string>
-    <string name="path">Path</string>
+    <string name="path">パス</string>
     <string name="invalid_image_path">無効な画像パス</string>
     <string name="image_editing_failed">画像の編集に失敗しました</string>
     <string name="edit_image_with">画像を編集:</string>
     <string name="no_editor_found">画像エディターが見つかりません</string>
     <string name="unknown_file_location">ファイルの場所が不明です</string>
     <string name="error_saving_file">元のファイルを上書きできません</string>
-    <string name="rotate_left">Rotate left</string>
-    <string name="rotate_right">Rotate right</string>
-    <string name="rotate_one_eighty">Rotate by 180º</string>
-    <string name="flip">Flip</string>
-    <string name="flip_horizontally">Flip horizontally</string>
-    <string name="flip_vertically">Flip vertically</string>
-    <string name="edit_with">Edit with</string>
+    <string name="rotate_left">左に回転</string>
+    <string name="rotate_right">右に回転</string>
+    <string name="rotate_one_eighty">180º回転</string>
+    <string name="flip">反転</string>
+    <string name="flip_horizontally">水平方向に反転</string>
+    <string name="flip_vertically">垂直方向に反転</string>
+    <string name="edit_with">他のアプリで編集</string>
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">シンプル壁紙</string>
-    <string name="set_as_wallpaper">壁紙として設定</string>
-    <string name="set_as_wallpaper_failed">壁紙としての設定に失敗しました</string>
-    <string name="set_as_wallpaper_with">壁紙として設定:</string>
+    <string name="set_as_wallpaper">壁紙に設定</string>
+    <string name="set_as_wallpaper_failed">壁紙の設定に失敗しました</string>
+    <string name="set_as_wallpaper_with">壁紙に設定:</string>
     <string name="no_capable_app_found">対応できるアプリが見つかりません</string>
-    <string name="setting_wallpaper">壁紙の設定&#8230;</string>
+    <string name="setting_wallpaper">壁紙に設定中&#8230;</string>
     <string name="wallpaper_set_successfully">壁紙を正常に設定しました</string>
-    <string name="portrait_aspect_ratio">Portrait aspect ratio</string>
-    <string name="landscape_aspect_ratio">Landscape aspect ratio</string>
+    <string name="portrait_aspect_ratio">縦向きの縦横比</string>
+    <string name="landscape_aspect_ratio">横向きの縦横比</string>
 
     <!-- Slideshow -->
-    <string name="slideshow">Slideshow</string>
-    <string name="interval">Interval (seconds):</string>
-    <string name="include_photos">Include photos</string>
-    <string name="include_videos">Include videos</string>
-    <string name="include_gifs">Include GIFs</string>
-    <string name="random_order">Random order</string>
-    <string name="use_fade">Use fade animations</string>
-    <string name="move_backwards">Move backwards</string>
-    <string name="loop_slideshow">Loop slideshow</string>
-    <string name="slideshow_ended">The slideshow ended</string>
-    <string name="no_media_for_slideshow">No media for the slideshow have been found</string>
+    <string name="slideshow">スライドショー</string>
+    <string name="interval">間隔 (秒):</string>
+    <string name="include_photos">写真を含める</string>
+    <string name="include_videos">ビデオを含める</string>
+    <string name="include_gifs">GIFを含める</string>
+    <string name="random_order">ランダムな順序</string>
+    <string name="use_fade">フェードアニメーションを使用する</string>
+    <string name="move_backwards">逆方向に進む</string>
+    <string name="loop_slideshow">スライドショーをリピート再生する</string>
+    <string name="slideshow_ended">スライドショーが終了しました</string>
+    <string name="no_media_for_slideshow">スライドショーに表示するメディアがありません</string>
 
     <!-- Settings -->
     <string name="show_hidden_media">非表示フォルダーを表示</string>
-    <string name="autoplay_videos">自動的にビデオを再生</string>
+    <string name="autoplay_videos">ビデオを自動再生する</string>
     <string name="toggle_filename">ファイル名の表示を切り替え</string>
-    <string name="loop_videos">Loop videos</string>
-    <string name="animate_gifs">Animate GIFs at thumbnails</string>
-    <string name="max_brightness">Max brightness when viewing media</string>
-    <string name="crop_thumbnails">Crop thumbnails into squares</string>
-    <string name="screen_rotation_by">Rotate fullscreen media by</string>
-    <string name="screen_rotation_system_setting">System setting</string>
-    <string name="screen_rotation_device_rotation">Device rotation</string>
-    <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
-    <string name="dark_background_at_fullscreen">Dark background at fullscreen media</string>
-    <string name="scroll_thumbnails_horizontally">Scroll thumbnails horizontally</string>
-    <string name="hide_system_ui_at_fullscreen">Automatically hide system UI at fullscreen media</string>
-    <string name="delete_empty_folders">Delete empty folders after deleting their content</string>
-    <string name="allow_video_gestures">Allow controlling video volume and brightness with vertical gestures</string>
-    <string name="replace_share_with_rotate">Replace Share with Rotate at fullscreen menu</string>
+    <string name="loop_videos">ビデオをリピート再生する</string>
+    <string name="animate_gifs">GIF画像のサムネイルをアニメーション表示する</string>
+    <string name="max_brightness">メディア再生時に明るさを最大にする</string>
+    <string name="crop_thumbnails">サムネイルを正方形に切り取る</string>
+    <string name="screen_rotation_by">メディア再生時のフルスクリーン表示切り替え</string>
+    <string name="screen_rotation_system_setting">システム設定に従う</string>
+    <string name="screen_rotation_device_rotation">端末の向きに従う</string>
+    <string name="screen_rotation_aspect_ratio">メディアの縦横比に従う</string>
+    <string name="dark_background_at_fullscreen">黒背景でフルスクリーン表示</string>
+    <string name="scroll_thumbnails_horizontally">サムネイル画面を横方向にスクロール</string>
+    <string name="hide_system_ui_at_fullscreen">フルスクリーン時にシステムUIを非表示にする</string>
+    <string name="delete_empty_folders">メディアの削除後にフォルダーが空になった場合、そのフォルダーを削除する</string>
+    <string name="allow_video_gestures">ビデオ再生中に、音量と明るさを縦方向のジェスチャーで変更する</string>
+    <string name="replace_share_with_rotate">フルスクリーンメニューの「共有」を「回転」に置き換える</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->