Merge commit '842bbb5c98ccc6cdbedddc5c8a01ea480a65d581'

2024-09-19 19:42:29 +02:00 · 2024-05-05 11:50:49 +01:00 · 2024-05-05 11:50:49 +01:00 · d53299775a
commit d53299775a
parent 711c9f7c4b 842bbb5c98
21 changed files with 73 additions and 49 deletions
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@ -200,7 +200,7 @@
    <string name="preference_record_audio_src">Крыніца гуку</string>
    <string name="preference_record_audio_src_summary">Мікрафон падчас запісу аўдыё\n%s</string>
    <string name="preference_record_audio_channels">Аўдыяканалы</string>
-    <string name="preference_record_audio_channels_summary">Мона або стэрэа падчас запісу аўдыё (стэрэа падтрымліваецца толькі на некаторых прыладах)</string>
+    <string name="preference_record_audio_channels_summary">Мона або стэрэа падчас запісу аўдыё (стэрэа падтрымліваецца толькі на некаторых прыладах)\n%s</string>
    <string name="preference_video_flash">Выьліск падчас запісу відэа</string>
    <string name="preference_video_flash_summary">Калі ўключана, то можна будзе ўкл / выкл выбліск падчас запісу відэа </string>

--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -204,7 +204,7 @@
    <string name="preference_record_audio_src">Zdroj zvuku</string>
    <string name="preference_record_audio_src_summary">Mikrofon používaný při natáčení videa\n%s</string>
    <string name="preference_record_audio_channels">Kanály zvuku</string>
-    <string name="preference_record_audio_channels_summary">Nastavit mono nebo stereo pro nahrávání zvuku (stereo je podporováno jen na některých zařízeních)</string>
+    <string name="preference_record_audio_channels_summary">Nastavit mono nebo stereo pro nahrávání zvuku (stereo je podporováno jen na některých zařízeních)\n%s</string>
    <string name="preference_video_flash">Blikat při nahrávání videa</string>
    <string name="preference_video_flash_summary">Při zapnutí bude přisvětlovací dioda blikat při nahrávání videa (umožňuje z dálky určit, zda-li fotoaparát nahrává)</string>
    
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -218,7 +218,7 @@
    <string name="preference_record_audio_src">Audio-Quelle</string>
    <string name="preference_record_audio_src_summary">Einstellung der Mikrofonquelle für die Tonaufnahme\n%s</string>
    <string name="preference_record_audio_channels">Audio-Kanäle</string>
-    <string name="preference_record_audio_channels_summary">Mono- oder Stereo-Aufnahme (Stereo wird nur von einigen Geräten unterstützt)</string>
+    <string name="preference_record_audio_channels_summary">Mono- oder Stereo-Aufnahme (Stereo wird nur von einigen Geräten unterstützt)\n%s</string>
    <string name="preference_video_flash">Blitzlicht während der Videoaufnahme</string>
    <string name="preference_video_flash_summary">Wenn aktiviert, blinkt der Blitz während der Videoaufnahme.</string>
    
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@ -216,7 +216,7 @@
    <string name="preference_record_audio_src">Πηγή ήχου</string>
    <string name="preference_record_audio_src_summary">Χρήση μικροφώνου για την καταγραφή ήχου\n%s</string>
    <string name="preference_record_audio_channels">Κανάλια ήχου</string>
-    <string name="preference_record_audio_channels_summary">Καθορισμός μονοφωνικής ή στερεοφωνικής καταγραφής ήχου (ο ήχος στέρεο υποστηρίζεται μόνο σε ορισμένες συσκευές)</string>
+    <string name="preference_record_audio_channels_summary">Καθορισμός μονοφωνικής ή στερεοφωνικής καταγραφής ήχου (ο ήχος στέρεο υποστηρίζεται μόνο σε ορισμένες συσκευές)\n%s</string>
    <string name="preference_video_flash">Φλας κατά την καταγραφή βίντεο</string>
    <string name="preference_video_flash_summary">Ενεργοποίηση τού φλας κατά την καταγραφή των βίντεο (μπορεί να χρησιμοποιηθεί αν γίνεται καταγραφή από απόσταση)</string>
    
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -217,7 +217,7 @@
    <string name="preference_record_audio_src">Fuente del audio</string>
    <string name="preference_record_audio_src_summary">Micrófono a utilizar para grabar audio\n%s</string>
    <string name="preference_record_audio_channels">Canales de audio</string>
-    <string name="preference_record_audio_channels_summary">Especifique mono o estéreo para grabar audio (estéreo sólo es admitido en algunos dispositivos)</string>
+    <string name="preference_record_audio_channels_summary">Especifique mono o estéreo para grabar audio (estéreo sólo es admitido en algunos dispositivos)\n%s</string>
    <string name="preference_video_flash">Flash durante la grabación de video</string>
    <string name="preference_video_flash_summary">Si está activado, el flash se activará/desactivará al grabar video (se puede utilizar para indicar que la cámara sigue grabando a distancia)</string>
    
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -213,7 +213,7 @@
    <string name="preference_record_audio_src">Source audio</string>
    <string name="preference_record_audio_src_summary">Sélectionne l\'entrée audio pour l\'enregistrement\n%s</string>
    <string name="preference_record_audio_channels">Format audio</string>
-    <string name="preference_record_audio_channels_summary">Spécifiez mono ou stéréo pour l\'enregistrement audio (stéréo uniquement pris en charge sur certains appareils)</string>
+    <string name="preference_record_audio_channels_summary">Spécifiez mono ou stéréo pour l\'enregistrement audio (stéréo uniquement pris en charge sur certains appareils)\n%s</string>
    <string name="preference_video_flash">Clignoter pendant l\'enregistrement vidéo</string>
    <string name="preference_video_flash_summary">Si activé, le flash se met en marche/arrêt lors de l\'enregistrement vidéo (peut être utile pour indiquer que l\'appareil est en train d\'enregistrer à distance)</string>
    
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@ -217,7 +217,7 @@
    <string name="preference_record_audio_src">Hangforrás</string>
    <string name="preference_record_audio_src_summary">Hangrögzítésre használandó mikrofon\n%s</string>
    <string name="preference_record_audio_channels">Hangcsatornák</string>
-    <string name="preference_record_audio_channels_summary">Monó vagy sztereó hangfelvétel készítése (sztereó felvételre nem minden eszköz képes)</string>
+    <string name="preference_record_audio_channels_summary">Monó vagy sztereó hangfelvétel készítése (sztereó felvételre nem minden eszköz képes)\n%s</string>
    <string name="preference_video_flash">Villogás felvétel alatt</string>
    <string name="preference_video_flash_summary">Ha engedélyezve van, a vaku ki-be kapcsol a felvétel alatt (ezzel jelezhető, hogy egy kamera épp rögzít a távolban)</string>
    
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -218,7 +218,7 @@
    <string name="preference_record_audio_src">Sorgente audio</string>
    <string name="preference_record_audio_src_summary">Il microfono da usare per la registrazione dell\'audio\n%s</string>
    <string name="preference_record_audio_channels">Canali audio</string>
-    <string name="preference_record_audio_channels_summary">Specifica modalità mono o stereo per la registrazione audio (modalità stereo supportata solo su alcuni modelli)</string>
+    <string name="preference_record_audio_channels_summary">Specifica modalità mono o stereo per la registrazione audio (modalità stereo supportata solo su alcuni modelli)\n%s</string>
    <string name="preference_video_flash">Flash durante la registrazione video</string>
    <string name="preference_video_flash_summary">Se abilitato, il flash sarà acceso/spento quando si registra il video (può essere usato per capire a distanza se la telecamera sta ancora registrando)</string>
    
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -216,7 +216,7 @@
    <string name="preference_record_audio_src">オーディオソース</string>
    <string name="preference_record_audio_src_summary">録音に使用するマイク\n%s</string>
    <string name="preference_record_audio_channels">オーディオチャンネル</string>
-    <string name="preference_record_audio_channels_summary">モノラルもしくはステレオを指定します (ステレオはサポートしている端末でのみ有効です)</string>
+    <string name="preference_record_audio_channels_summary">モノラルもしくはステレオを指定します (ステレオはサポートしている端末でのみ有効です)\n%s</string>
    <string name="preference_video_flash">録画中にライトを点滅する</string>
    <string name="preference_video_flash_summary">有効にすると撮影中にライトが点滅します (撮影中である事を相手に伝えることができます)</string>
    
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@ -217,7 +217,7 @@
    <string name="preference_record_audio_src">Lydkilde</string>
    <string name="preference_record_audio_src_summary">Mikrofonen som skal brukes til lydopptak\n%s</string>
    <string name="preference_record_audio_channels">Lydkanaler</string>
-    <string name="preference_record_audio_channels_summary">Velg mono eller stereo for opptak av lyd (Stereo støttes kun på noen enheter).</string>
+    <string name="preference_record_audio_channels_summary">Velg mono eller stereo for opptak av lyd (Stereo støttes kun på noen enheter).\n%s</string>
    <string name="preference_video_flash">Blits under videoopptak</string>
    <string name="preference_video_flash_summary">Hvis dette er aktivert, vil blitsen skru seg av/på under videoopptak (Kan brukes til å se på avstand om kameraet fortsatt tar opp).</string>
    
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -216,7 +216,7 @@
    <string name="preference_record_audio_src">Źródło dźwięku</string>
    <string name="preference_record_audio_src_summary">Wybór mikrofonu, z którego będzie nagrywany dźwięk\n%s</string>
    <string name="preference_record_audio_channels">Źródło dźwięku</string>
-    <string name="preference_record_audio_channels_summary">Wybór między dźwiękiem mono a stereo (dostępne tylko na niektórych urządzeniach)</string>
+    <string name="preference_record_audio_channels_summary">Wybór między dźwiękiem mono a stereo (dostępne tylko na niektórych urządzeniach)\n%s</string>
    <string name="preference_video_flash">Błysk podczas nagrywania</string>
    <string name="preference_video_flash_summary">Jeśli włączono, lampa błyskowa będzie się włączać i wyłączać (przydatne w przypadku gdy chcemy z większej odległości stwierdzić czy kamera wciąż nagrywa)</string>
    <string name="preference_category_online">Różne</string>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@ -217,7 +217,7 @@
    <string name="preference_record_audio_src">Fonte de áudio</string>
    <string name="preference_record_audio_src_summary">O microfone usado na gravação de áudio\n%s</string>
    <string name="preference_record_audio_channels">Canais de áudio</string>
-    <string name="preference_record_audio_channels_summary">Especificar mono ou estéreo para a gravação de áudio (estéreo apenas é suportado em alguns dispositivos)</string>
+    <string name="preference_record_audio_channels_summary">Especificar mono ou estéreo para a gravação de áudio (estéreo apenas é suportado em alguns dispositivos)\n%s</string>
    <string name="preference_video_flash">Flash durante a gravação de vídeo</string>
    <string name="preference_video_flash_summary">Se ativado, o flash será ligado/desligado durante a gravação de vídeo (pode ser usado para verificar à distância se câmara ainda está a gravar)</string>
    
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -218,7 +218,7 @@
    <string name="preference_record_audio_src">Источник звука</string>
    <string name="preference_record_audio_src_summary">Микрофон для записи звука\n%s</string>
    <string name="preference_record_audio_channels">Число каналов</string>
-    <string name="preference_record_audio_channels_summary">Настройка моно или стереозвука (стерео доступно не на всех устройствах)</string>
+    <string name="preference_record_audio_channels_summary">Настройка моно или стереозвука (стерео доступно не на всех устройствах)\n%s</string>
    <string name="preference_video_flash">Вспышка во время записи видео</string>
    <string name="preference_video_flash_summary">Если включено, вспышка будет включаться/выключаться при записи видео (можно использовать, чтобы выполнить запись на расстоянии)</string>
    
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@ -218,7 +218,7 @@
    <string name="preference_record_audio_src">Vir zvoka</string>
    <string name="preference_record_audio_src_summary">Kateri mikrofon naj se uporabi za snemanje zvoka.  Upoštevajte, da je podrobno vedenje te možnosti odvisno od načina vdelave te možnosti v napravo.\n%s</string>
    <string name="preference_record_audio_channels">Zvočni kanali</string>
-    <string name="preference_record_audio_channels_summary">Določite mono ali stereo za snemanje zvoka (stereo je podprt samo na nekaterih napravah)</string>
+    <string name="preference_record_audio_channels_summary">Določite mono ali stereo za snemanje zvoka (stereo je podprt samo na nekaterih napravah)\n%s</string>
    <string name="preference_video_flash">Svetilka med snemanjem videoposnetkov</string>
    <string name="preference_video_flash_summary">Če je omogočeno, se bo ob snemanju videoposnetkov vklopila/izklopila svetilka (se lahko uporabi za prepoznavanje delovanja kamere na razdaljo)</string>
    
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -203,7 +203,7 @@
    <string name="preference_record_audio_src">Sesin Kaynağı</string>
    <string name="preference_record_audio_src_summary">Ses kaydetmede kullanılacak mikrofon\n%s</string>
    <string name="preference_record_audio_channels">Ses kanalları</string>
-    <string name="preference_record_audio_channels_summary">Ses kaydetmede kullanılacak kanalları mono ya da stereo özelleştir(stereo sadece bazı cihazlarda desteklenir)</string>
+    <string name="preference_record_audio_channels_summary">Ses kaydetmede kullanılacak kanalları mono ya da stereo özelleştir(stereo sadece bazı cihazlarda desteklenir)\n%s</string>
    <string name="preference_video_flash">vidyo kaydederken Flaşı aç</string>
    <string name="preference_video_flash_summary">Etkinleştirildiğinde, flaş vidyo kaydederken yanıp sönecektir(kameranın hala uzak bir yerde kayıt yaptığını anlamak için kullanılabilir)</string>
    
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -218,7 +218,7 @@
    <string name="preference_record_audio_src">Джерело звуку</string>
    <string name="preference_record_audio_src_summary">Мікрофон для запису звуку\n%s</string>
    <string name="preference_record_audio_channels">Число каналів</string>
-    <string name="preference_record_audio_channels_summary">Налаштування моно чи стереозвуку (стерео доступно не для всіх пристроїв)</string>
+    <string name="preference_record_audio_channels_summary">Налаштування моно чи стереозвуку (стерео доступно не для всіх пристроїв)\n%s</string>
    <string name="preference_video_flash">Спалах під час запису відео</string>
    <string name="preference_video_flash_summary">Якщо увімкнуто, спалах буде вмикатися/вимикатися під час запису відео (можна використовувати, аби виконувати запис на відстані)</string>

--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@ -217,7 +217,7 @@
    <string name="preference_record_audio_src">Nguồn âm thanh</string>
    <string name="preference_record_audio_src_summary">Micrô được sử dụng để ghi âm\n%s</string>
    <string name="preference_record_audio_channels">Kênh âm thanh</string>
-    <string name="preference_record_audio_channels_summary">Thiết lập âm thanh đơn hoặc nổi (chỉ hỗ trợ âm thanh nổi trên một số thiết bị)</string>
+    <string name="preference_record_audio_channels_summary">Thiết lập âm thanh đơn hoặc nổi (chỉ hỗ trợ âm thanh nổi trên một số thiết bị)\n%s</string>
    <string name="preference_video_flash">Nháy đèn flash khi quay video</string>
    <string name="preference_video_flash_summary">Nếu kích hoạt, đèn flash sẽ nháy khi quay video (có thể được sử dụng để cảnh báo camera vẫn đang quay ở khoảng cách xa)</string>
    
--- a/app/src/main/res/values-zh-rCN/arrays.xml
+++ b/app/src/main/res/values-zh-rCN/arrays.xml
@ -5,7 +5,7 @@
        <item>无穷远</item>
        <item>微距</item>
        <item>锁定焦点</item>
-        <item>手工对焦</item>
+        <item>手动对焦</item>
        <item>固定对焦</item>
        <item>EDOF对焦</item>
        <item>持续对焦</item>
@ -79,12 +79,12 @@
        <item>double</item>
    </string-array>
    <string-array name="preference_volume_keys_entries">
-        <item>对焦 (或开始/停止录像)</item>
+        <item>拍照(或开始/停止录像)</item>
        <item>对焦</item>
        <item>放大/缩小</item>
-        <item>更改曝光水平</item>
-        <item>切换自动稳定开/关</item>
-        <item>更改设备音量</item>
+        <item>曝光等级</item>
+        <item>自动水平(开/关)</item>
+        <item>设备音量</item>
        <item>什么都不做</item>
        </string-array>
    <string-array name="preference_volume_keys_values">
@ -242,4 +242,16 @@
        <item>audio_mono</item>
        <item>audio_stereo</item>
    </string-array>
+    <string-array name="preference_save_zulu_time_entries">
+        <item>本地时间</item>
+        <item>UTC (祖鲁)</item>
+    </string-array>
+    <string-array name="preference_front_camera_mirror_entries">
+        <item>不镜像</item>
+        <item>镜像</item>
+    </string-array>
+    <string-array name="preference_video_subtitle_entries">
+        <item>无字幕</item>
+        <item>记录字幕</item>
+    </string-array>
 </resources>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -33,9 +33,9 @@
    <string name="video">视频</string>
    <string name="exposure_locked">曝光锁定</string>
    <string name="exposure_unlocked">曝光解锁</string>
-    <string name="cancelled_timer">已取消定时器</string>
+    <string name="cancelled_timer">已取消倒计时</string>
    <string name="cancelled_repeat_mode">已取消连拍模式</string>
-    <string name="started_timer">已开始定时器</string>
+    <string name="started_timer">开始倒计时</string>
    <string name="failed_to_save_video">保存视频文件失败</string>
    <string name="failed_to_record_video">录制视频失败</string>
    <string name="started_recording_video">已开始录制视频</string>
@ -90,13 +90,13 @@
    <string name="preference_face_detection_summary">通过识别人脸完成对焦</string>

    <string name="preference_category_camera_controls">相机控制</string>
-    <string name="preference_timer">定时器</string>
-    <string name="preference_timer_beep">定时器蜂鸣</string>
-    <string name="preference_timer_beep_summary">当计时器倒数或连拍模式延迟时蜂鸣</string>
+    <string name="preference_timer">倒计时</string>
+    <string name="preference_timer_beep">倒计时蜂鸣器</string>
+    <string name="preference_timer_beep_summary">倒计时、连拍间隔时发出蜂鸣器声</string>
    <string name="preference_timer_speak">语音定时器倒计时</string>
-    <string name="preference_timer_speak_summary">说出定时器倒计时或连拍模式延时（从60秒开始）</string>
+    <string name="preference_timer_speak_summary">语音播报倒计时或连拍延时（从60秒开始倒数）</string>
    <string name="preference_burst_mode">连拍模式</string>
-    <string name="preference_burst_interval">连拍模式间隔</string>
+    <string name="preference_burst_interval">连拍间隔时长</string>
    <string name="preference_screen_camera_controls_more">更多相机控制…</string>
    <string name="preference_touch_capture">触摸快门</string>
    <string name="preference_touch_capture_summary">拍照只需通过触摸预览</string>
@ -105,7 +105,7 @@
    <string name="preference_shutter_sound">快门声音</string>
    <string name="preference_shutter_sound_summary">拍照时播放声音</string>
    <string name="preference_volume_keys">音量键功能</string>
-    <string name="preference_audio_control">语音识别</string>
+    <string name="preference_audio_control">声控拍照</string>
    <string name="preference_audio_noise_control_sensitivity">麦克风灵敏度</string>
    <string name="preference_audio_noise_control_sensitivity_summary">使用语音识别时麦克风过滤噪声的阈值</string>
    <string name="preference_save_location">保存位置</string>
@ -140,7 +140,7 @@
    <string name="preference_show_angle">显示角度</string>
    <string name="preference_show_angle_summary">在屏幕上显示当前的设备与铅垂线的夹角</string>
    <string name="preference_show_angle_line">显示角度线</string>
-    <string name="preference_show_angle_line_summary">显示水平线</string>
+    <string name="preference_show_angle_line_summary">显示水平基准线</string>
    <string name="preference_angle_highlight_color">角度高亮颜色</string>
    <string name="preference_angle_highlight_color_summary">当相机几乎是水平时的高亮颜色</string>
    <string name="preference_show_geo_direction">显示罗盘方向</string>
@ -153,8 +153,8 @@
    <string name="grid">网格</string> <!-- short form of Show a grid -->
    <string name="preference_crop_guide">显示裁剪框</string>
    <string name="preference_crop_guide_summary">屏幕上显示一个预设比例的矩形框体。\n如果你拍照后会裁剪照片/视频为不同长宽比的照片，这就很有用了。\n%s</string>
-    <string name="preference_show_toasts">显示 \"toast\" 消息</string>
-    <string name="preference_show_toasts_summary">是否显示弹出的 \"toast\" 消息</string>
+    <string name="preference_show_toasts">显示toast消息</string>
+    <string name="preference_show_toasts_summary">是否显示弹出的toast消息</string>
    <string name="preference_thumbnail_animation">显示缩略图动画</string>
    <string name="preference_thumbnail_animation_summary">当拍照时显示移动缩略图动画</string>
    <string name="preference_keep_display_on">保持屏幕常亮</string>
@ -168,7 +168,7 @@
    <string name="preference_screen_location_settings">位置设置…</string>
    <string name="preference_resolution">相机分辨率</string>
    <string name="preference_quality">照片质量</string>
-    <string name="preference_quality_summary">设置保存的照片质量（建议值是90%%）\n%s</string>
+    <string name="preference_quality_summary">设置保存照片的质量（推荐值90%%）\n%s</string>
    <string name="preference_location">存储位置数据 (地理标记)</string>
    <string name="preference_location_summary">在照片/视频中存储 GPS 位置数据</string>
    <string name="preference_gps_direction">存储罗盘方向</string>
@ -209,8 +209,8 @@
    <string name="preference_record_audio_summary">录像时录音</string>
    <string name="preference_record_audio_src">音频源</string>
    <string name="preference_record_audio_src_summary">麦克风用于录制音频\n%s</string>
-    <string name="preference_record_audio_channels">音频声道</string>
-    <string name="preference_record_audio_channels_summary">规定使用单声道或者立体声进行录音（仅部分设备支持立体声）。</string>
+    <string name="preference_record_audio_channels">录音通道数</string>
+    <string name="preference_record_audio_channels_summary">规定使用单声道或者立体声进行录音（仅部分设备支持立体声）\n%s</string>
    <string name="preference_video_flash">录像时闪光</string>
    <string name="preference_video_flash_summary">如果启用，录像时闪光将开启/关闭 (在一段距离外可以用来告诉相机仍然在录制)。</string>
    
@ -424,13 +424,13 @@
    <string name="preference_show_geo_direction_lines_summary">显示罗盘方向线</string>
    <string name="video_pause">暂停录像</string>
    <string name="video_resume">继续录像</string>
-    <string name="preference_show_take_photo">显示“拍照按钮”</string>
+    <string name="preference_show_take_photo">显示拍照按钮</string>
    <string name="preference_show_take_photo_summary">显示拍照、录像按钮。除非你有其他方法（比如硬件快门、使用音量键），否则不应该取消勾选</string>


    <string name="preference_expo_bracketing_n_images_summary">包围曝光的图片数量\n%s</string>

-    <string name="preference_nr_save_summary">在降噪模式中保存原图。注意这会让保存照片慢很多。\n%s</string>
+    <string name="preference_nr_save_summary">开启降噪模式后仍然保存原图。注意这会让保存照片变慢很多。\n%s</string>

    <string name="video_power_critical">停止录像\n电量严重不足</string>
    <string name="preference_video_low_power_check">检查电池报警</string>
@ -456,7 +456,7 @@
    <string name="preference_camera2_fast_burst">快速HDR/包围曝光</string>
    <string name="preference_camera2_fast_burst_summary">允许更快地完成HDR/包围拍照。如果您的设备在使用HDR/包围模式拍照时出现了问题，请禁用此功能。</string>

-    <string name="open_files_saf_exception_ghost">在设备上没有找到文件选择器，所以不能使用辅助图像功能。</string>
+    <string name="open_files_saf_exception_ghost">没有在设备上找到文件选择器，所以不能使用辅助图像功能。</string>
    <string name="saf_permission_failed_open_image">无法打开文件</string>

    <string name="preference_camera2_photo_video_recording">允许在录像时拍照</string>
@ -625,11 +625,15 @@
    <string name="photo_mode_noise_reduction_full">降噪(NR)</string>
    <string name="preference_category_stamp">照片水印</string>
    <string name="preference_hdr_save_expo">保存HDR模式采集的所有原图</string>
-    <string name="preference_hdr_save_expo_summary">启用后使用HDR模式拍照会保存三个基本曝光图像以及最终的HDR照片。注意这会使保存速度变慢，尤其是启用了“照片水印”或自动水平等功能时。</string>
+    <string name="preference_hdr_save_expo_summary">启用后使用HDR模式拍照会保存三个基本曝光图像以及最终的HDR照片。注意这会使保存速度变慢，尤其是同时启用了“照片水印”或“自动水平”等功能时。</string>

    <string name="no_permission">没有获得授权</string>
    <string name="permission_rationale_title">需要授权</string>
    <string name="permission_rationale_camera">操作相机需要相机权限</string>
+    <string name="preference_camera2_dummy_capture_hack">启用虚拟捕捉修复HDR/包围曝光</string>
+    <string name="preference_camera2_dummy_capture_hack_summary">如果您的设备在使用HDR或包围曝光模式拍摄照片时出现问题（比如包围曝光模式的图像的曝光度相同），请尝试启用此选项。只有同时启用了下面的快速HDR/包围曝光选项时才会有效。</string>
+    <string name="permission_rationale_bluetooth_scan_connect">发现和连接BLE远程控制设备需蓝牙扫描/连接权限。</string>
+    <string name="unknown_device_no_permission">未知设备（蓝牙连接权限不可用）</string>
    <string name="permission_rationale_record_audio">录像和语音控制需要麦克风权限</string>

    <string name="flash_frontscreen_auto">自动开启屏幕补光</string>
@ -795,7 +799,7 @@

    <string name="cycle_flash">循环闪光灯的模式</string>
    <string name="preference_show_cycle_flash">显示闪光灯按钮</string>
-    <string name="preference_show_cycle_flash_summary">按下按钮后循环切换闪光灯模式，而不是弹出菜单选项。</string>
+    <string name="preference_show_cycle_flash_summary">按下按钮后切换闪光灯模式，而不是弹出选项菜单。</string>

    <string name="preference_raw_expo_bracketing">允许RAW包围曝光</string>
    <!--Whether the RAW option should also apply for expo bracketing photo mode (or for HDR mode when \"Save all images for HDR mode\" is enabled). If this option is disabled, only JPEGs will be saved in those photo modes.-->
@ -914,8 +918,8 @@
    <string name="preference_video_profile_gamma_2_4">2.4</string>
    <string name="preference_video_profile_gamma_2_6">2.6</string>
    <string name="preference_video_profile_gamma_2_8">2.8</string>
-    <string name="preference_ghost_image_alpha">辅助图片透明度</string>
-    <string name="preference_ghost_image_alpha_summary">用于辅助图片的透明度值。较低的值代表更透明，较高的值代表更不透明。\n%s</string>
+    <string name="preference_ghost_image_alpha">辅助图像透明度</string>
+    <string name="preference_ghost_image_alpha_summary">设置辅助图像的透明度值。值越低越透明，值越高越不透明。\n%s</string>
    <string name="external_camera">外部相机</string>
    <string name="ultrawide">超广角</string>
    <string name="switch_to_external_camera">切换至外部相机</string>
@ -942,13 +946,21 @@

    <string name="preference_comment_ypr">保存三轴运动信息</string>
    <string name="preference_comment_ypr_summary">在照片的 Exit 用户备注字段保存设备的三轴运动信息(仅适用于JPEG格式)</string>
-    <string name="preference_audio_control_summary">根据噪点拍照。
-        当启用后，使用屏幕上的麦克风按钮来启动监听。
+    <string name="preference_audio_control_summary">启用此功能后，可以点击屏幕上的麦克风按钮来启动监听。麦克风检测到声音后，自动拍照或者录像。
        \n%s</string>
    <string name="intro_text">点击来对焦，然后按下蓝色相机按钮以拍照。要禁用最大屏幕亮度，查阅设置/屏幕GUI/\"强制最大亮度\"选项。要在 Android 5 之后的设备上保存至 SD 卡，查阅设置/更多相机控制/\"Storage Access Framework\"。如需更多帮助，在设置中点击“在线帮助”。</string>

-    <string name="preference_audio_control_none">无</string>
+    <string name="preference_audio_control_none">不使用</string>
    <string name="preference_audio_control_noise">大的声音</string>
-    <string name="preference_audio_control_voice">语音命令: \"cheese\"</string> <!-- note that cheese shouldn't be translated, as we listen for this no matter what language is being used -->
+    <string name="preference_audio_control_voice">语音命令: \"cheese\"</string>
+    <string name="permission_rationale_storage">需要存储读/写权限才能保存照片或视频文件</string>
+    <string name="permission_rationale_location">地理标记需要位置权限（将位置数据存储在照片和视频，包括水印和）。还需要位置权限（至少对于 Android 11 及更早版本）才能连接到BLE远程控制设备。</string>
+    <string name="preference_hdr_tonemapping">HDR映射</string>
+    <string name="preference_hdr_tonemapping_summary">在HDR模式中使用的色调映射算法\n%s</string>
+    <string name="preference_remove_device_exif">删除设备 EXIF 信息</string>
+    <string name="preference_remove_device_exif_summary">是否删除 JPEG 照片中的设备 EXIF 信息。其他 EXIF 信息（如坐标/海拔）不受影响，RAW/DNG 和视频也不受影响。\n%s</string>
+    <string name="preference_remove_device_exif_off">不删除设备 EXIF 信息</string>
+    <string name="preference_remove_device_exif_on">删除设备 EXIF 信息</string>
+    <string name="preference_remove_device_exif_keep_datetime">删除日期/时间以外的信息</string> <!-- note that cheese shouldn't be translated, as we listen for this no matter what language is being used -->

 </resources>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -218,7 +218,7 @@
    <string name="preference_record_audio_src">音源</string>
    <string name="preference_record_audio_src_summary">用於錄製音訊的麥克風。請注意，這個選項真正的行為取決於您的裝置如何實作這個選項。\n%s</string>
    <string name="preference_record_audio_channels">音源頻道</string>
-    <string name="preference_record_audio_channels_summary">指定使用單聲道或立體聲來錄音 (立體聲只支援某些裝置)</string>
+    <string name="preference_record_audio_channels_summary">指定使用單聲道或立體聲來錄音 (立體聲只支援某些裝置)\n%s</string>
    <string name="preference_video_flash">錄影時閃光</string>
    <string name="preference_video_flash_summary">如果啟用，錄影時閃光將開啟/關閉 (在一段距離外可以用來判斷相機仍然在錄製)</string>
    
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -219,7 +219,7 @@
    <string name="preference_record_audio_src">Audio source</string>
    <string name="preference_record_audio_src_summary">Microphone to use for recording audio. Note that the exact behaviour of the options depends on how the option is implemented on your device.\n%s</string>
    <string name="preference_record_audio_channels">Audio channels</string>
-    <string name="preference_record_audio_channels_summary">Specify mono or stereo for recording audio (stereo only supported on some devices)</string>
+    <string name="preference_record_audio_channels_summary">Specify mono or stereo for recording audio (stereo only supported on some devices)\n%s</string>
    <string name="preference_video_flash">Flash while recording video</string>
    <string name="preference_video_flash_summary">If enabled, flash will switch on/off when recording video (can be used to tell camera is still recording at a distance)</string>