resolve conflicts

2020-07-31 00:30:05 +08:00
parent e06fb53f48 e7180e2633
commit bd2fdf4c70
340 changed files with 8623 additions and 10472 deletions
@@ -367,7 +367,6 @@
    "HeaderPassword": "密码",
    "HeaderPasswordReset": "密码重置",
    "HeaderPaths": "路径",
-    "HeaderPendingInvitations": "等待邀请",
    "HeaderPeople": "人物",
    "HeaderPhotoAlbums": "相册",
    "HeaderPinCodeReset": "重置PIN码",