OSDN Git Service

Merge Official Source
authorTianling Shen <cnsztl@immortalwrt.org>
Fri, 16 Apr 2021 16:10:02 +0000 (00:10 +0800)
committerTianling Shen <cnsztl@immortalwrt.org>
Fri, 16 Apr 2021 16:10:02 +0000 (00:10 +0800)
commit48938fa9f0d55bf778af6fda076eeecefacbeffb
tree2b519acef4bd56c7f6eee070e704c17463928e8f
parent719f8f2519ebcbf9b97d2c72424b81009f9aeb0c
parent5c792aefc744d1417fc9e24cfb92cd61cf8a651f
Merge Official Source

Resolve conflicts:
- modules/luci-base/po/zh_Hans/base.po
- modules/luci-base/po/zh_Hant/base.po

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
modules/luci-base/po/en/base.po
modules/luci-base/po/zh_Hans/base.po
modules/luci-base/po/zh_Hant/base.po