Merge branch 'dev'

mac

2024-06-12 12d6db5780d8a2121a3bef2d58bf897b24ff552a

 app/src/main/res/values-en/strings.xml

@@ -74,10 +74,10 @@
    <string name="power_station">Power station</string>
    <string name="power_station_me">Mine</string>
    <string name="my_power_station">My power station</string>
    <string name="power_station_generated_power">Power generation:</string>
    <string name="power_station_generated_power">Power generation</string>
    <string name="power_station_Power_generation_today">Today power generation</string>
    <string name="power_station_creation_time">Established at</string>
    <string name="my_power_station_installed_capacity">Installed capacity:</string>
    <string name="my_power_station_installed_capacity1">Installed capacity</string>
    <string name="my_power_station_connecting">Connecting</string>
    <string name="my_power_station_off_line">Offline</string>
    <string name="my_power_station_malfunction">Malfunction</string>
@@ -104,7 +104,7 @@
    <string name="message_alarm_details_time">Alarm time</string>
    <string name="message_alarm_details_back">Back</string>
    <string name="message_alarm_details_resolved">Solved</string>
    <string name="message_alarm_data_null">No alarm</string>
    <string name="message_alarm_data_null">No alarm!</string>


    <!--我的-->
@@ -247,4 +247,64 @@
    <string name="restarting_please_wait">Restarting, please wait</string>
    <string name="port_conflict">Application conflicts. You need to close onpro or other versions of debugging application and then restart the this to try</string>


    <string name="cancel_download_successfully">取消下载成功.</string>
    <string name="writing_firmware_upgrade_memory_succeeded">写入新固件文件到内存成功.</string>
    <string name="download_firmware_upgrade_file_failed">下载固件升级文件失败.</string>
    <string name="found_locally_firmware_upgrade_file">本地找不到升级固件文件,请下载好固件文件,再重新升级.</string>
    <string name="notify_gateway_firmware_upgrade_failed">通知给网关升级固件文件地址失败,无法升级.</string>
    <string name="local_service_fails">本地服务有异常失败,无法升级.</string>
    <string name="writing_drive_memory_succeeded">写入新驱动文件到内存成功.</string>
    <string name="download_drive_file_failed">下载驱动升级文件失败.</string>
    <string name="found_locally_drive_file">本地找不到升级驱动文件,请下载好驱动文件,再重新升级.</string>
    <string name="notify_gateway_drive_failed">通知给网关升级驱动文件地址失败,无法升级.</string>
    <string name="time_selectd">时间选择</string>
    <string name="life_cycle">生命期</string>
    <string name="year">年</string>
    <string name="month">月</string>
    <string name="day">日</string>
    <string name="hour">时</string>
    <string name="minutc">分</string>
    <string name="seconds">秒</string>
    <string name="the_query_date_is_exceeded">超出查询日期.</string>
    <string name="energy_generation_statistics">发电量统计</string>
    <string name="social_contribution">社会贡献</string>
    <string name="day_power_generation">当日发电量</string>
    <string name="month_power_generation">当月发电量</string>
    <string name="year_power_generation">当年发电量</string>
    <string name="cumulative_power_generation">累计发电量</string>
    <string name="generated_power">发电功率</string>
    <string name="generation">发电量</string>
    <string name="station_name">电站名称</string>
    <string name="search">搜索</string>
    <string name="history_search">历史搜索</string>
    <string name="search_content_null">搜索内容不能为空.</string>
    <string name="no_equipment">暂无设备.</string>
    <string name="filtering">筛选</string>
    <string name="reset">重置</string>
    <string name="string_capacity">组串容量</string>
    <string name="grid_connected_state">并网状态</string>
    <string name="grid_connected">并网</string>
    <string name="off_network">离网</string>
    <string name="the_input_value_has_been_exceeded">输入值已经超过</string>
    <string name="all_read">全部已读</string>
    <string name="contact_us">联系我们</string>
    <string name="wechat_id">微信号</string>
    <string name="email_address">邮箱地址</string>
    <string name="successful_replication">已复制到剪切板</string>
    <string name="to_be_added">待接入</string>
    <string name="saving_standard_coal">节约标准煤</string>
    <string name="co_reduction_rate">CO2减排</string>
    <string name="quantity_of_equivalent_values">等效植树量</string>
    <string name="pv_power">发电功率</string>
    <string name="device_run_state">设备运行状态</string>
    <string name="search_station">搜索电站</string>
    <string name="enter_the_device_sn_and_device_name">输入设备SN号/设备名称</string>
    <string name="enter_alarm_name">输入报警名称</string>
    <string name="device">设备</string>
    <string name="Offline_fault">离线有故障</string>
    <string name="active_power">有功功率</string>
    <string name="t">t</string>
    <string name="number"></string>

</resources>