- "title": "記低",
- "help": "修改放上公家街圖,等其他用者都睇到。",
- "no_changes": "無修改可記",
- "error": "記上去時出錯",
- "uploading": "修改傳上公家街圖。",
- "unsaved_changes": "你有修改未記妥"
+ "title": "儲存",
+ "help": "儲存變更至OpenStreetMap,讓其他用戶都看得到。",
+ "no_changes": "沒有變更需要儲存。",
+ "error": "儲存時發生錯誤",
+ "status_code": "伺服器提供的狀態碼{code}",
+ "unknown_error_details": "請確保你已連接至互聯網。",
+ "uploading": "正在上傳變更到OpenStreetMap。",
+ "unsaved_changes": "你有未儲存的變更",
+ "conflict": {
+ "header": "解決有衝突的編輯項目",
+ "count": " {total}個衝突中的第{num}個",
+ "previous": "< 上一個",
+ "next": "下一個 >",
+ "keep_local": "保留我的",
+ "keep_remote": "使用其他人的",
+ "restore": "復原",
+ "delete": "放棄資料",
+ "download_changes": "或者下載你的變更。",
+ "done": "所有衝突已解決!",
+ "help": "另一用戶已變更了一些你變更過的地圖特徵。\n按一下下面的每一個項目以了解有關衝突並決定是否需要保留\n你的變更或者是其他用戶的變更。\n"
+ }
+ },
+ "merge_remote_changes": {
+ "conflict": {
+ "deleted": "這物件已被{user}刪除。",
+ "location": "這物件被你和{user}移動過。",
+ "nodelist": "這些節被你和{user}變更過。",
+ "memberlist": "關係構件已被你和{user}改變了。",
+ "tags": "你變更了{tag}標籤為\"{local}\",而{user}變更為\"{remote}\"。"
+ }