merge in jb-mr2-release history after reset to master
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 121dd34..b31d0f1 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -51,7 +51,7 @@
<string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"低速度撮影"</string>
<string name="pref_camera_settings_category" msgid="2576236450859613120">"カメラ設定"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"ビデオ録画設定"</string>
- <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"表示サイズ"</string>
+ <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"画像サイズ"</string>
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8Mピクセル"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5メガピクセル"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3メガピクセル"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 74333f4..7202393 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -135,8 +135,8 @@
<string name="accessibility_review_cancel" msgid="9070531914908644686">"Отмена"</string>
<string name="accessibility_review_ok" msgid="7793302834271343168">"Готово"</string>
<string name="accessibility_review_retake" msgid="659300290054705484">"Ещё раз"</string>
- <string name="capital_on" msgid="5491353494964003567">"ВКЛ"</string>
- <string name="capital_off" msgid="7231052688467970897">"ВЫКЛ"</string>
+ <string name="capital_on" msgid="5491353494964003567">"Вкл"</string>
+ <string name="capital_off" msgid="7231052688467970897">"Выкл"</string>
<string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Выкл."</string>
<string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"0,5 сек."</string>
<string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1 сек."</string>
