Skip to content

Merge release/3.2.3 into develop #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leeari95 merged 3 commits into from
Apr 29, 2026
Merged

Merge release/3.2.3 into develop #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2d9d14
[fix] iCloud 자동 복원으로 인한 로컬 데이터 초기화 방지 (#175)
leeari95 Apr 22, 2026
9377abd
chore: bump marketing version to 3.2.3
github-actions[bot] Apr 22, 2026
65d8fe6
✨ [feat] iCloud 동기화 추적용 원격 로그 인프라 구축 (#176)
leeari95 Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Animal-Crossing-Wiki/Configurations/TargetVersion.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 배포 버전 제어용. 워크플로우에서 TARGET_VERSION 값을 덮어씁니다.
TARGET_VERSION = 3.2.2
TARGET_VERSION = 3.2.3
20 changes: 19 additions & 1 deletion Animal-Crossing-Wiki/Projects/App/Resources/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,30 @@ Find the villagers you have visited and tap the home icon on the villager's page
// MARK: - AppSettingView
"System haptic" = "System haptic";
"Data reset" = "Data reset";
"Recover data from iCloud" = "Recover data from iCloud";
"Recover data from iCloud" = "Restore from iCloud (overwrites local)";
"iCloud Data Recovery" = "iCloud Data Recovery";
"This will reset local data and re-download from iCloud. Continue?" = "This will reset local data and re-download from iCloud. Continue?";
"Recovery warning: local data will be erased" = "⚠️ All collection data on this device will be deleted and replaced with the iCloud backup. This cannot be undone.";
"Are you absolutely sure?" = "Are you absolutely sure?";
"Recovery final confirm" = "Final confirmation. Local data will be fully replaced by the iCloud backup. Make sure an up-to-date backup exists in iCloud.";
"Recovery Complete" = "Recovery Complete";
"Please restart the app to complete data recovery from iCloud." = "Please restart the app to complete data recovery from iCloud.";
"Recovery Failed" = "Recovery Failed";
"Clean duplicate data" = "Clean duplicate & orphan data";
"Consolidate warning" = "Merges duplicate collections caused by sync issues and removes dangling data. Use only when sync seems wrong.";
"Restore from local backup" = "Restore from local backup";
"Local backup detected" = "Local backup detected";
"Local backup detected message" = "Your local data appears to have been wiped by CloudKit sync. Restore from local backup saved %@ (%d items)?\n\nYou can wait for iCloud or restore from the local backup right now.";
"Wait for iCloud" = "Wait for iCloud";
"Restore local backup" = "Restore local backup";
"Restore complete" = "Restore complete";
"Restored %d items" = "Restored %d items.";
"Restore failed" = "Restore failed";
"No local backup found" = "No local backup found.";
"Local backup info" = "Last local backup";
"Local backup info format" = "%@ · %d items";
"No local backup" = "No local backup";
"Restore local backup warning" = "Current local data will be replaced with the backup saved %@ (%d items). Continue?";
"iCloud sync status" = "iCloud sync";
"Syncing..." = "Syncing...";
"Waiting for iCloud data..." = "Waiting for iCloud data...";
Expand Down
20 changes: 19 additions & 1 deletion Animal-Crossing-Wiki/Projects/App/Resources/ko.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,30 @@
// MARK: - AppSettingView
"System haptic" = "시스템 햅틱";
"Data reset" = "수집 및 섬 데이터 초기화";
"Recover data from iCloud" = "iCloud에서 데이터 복구";
"Recover data from iCloud" = "iCloud에서 복원 (로컬 데이터 덮어씀)";
"iCloud Data Recovery" = "iCloud 데이터 복구";
"This will reset local data and re-download from iCloud. Continue?" = "로컬 데이터를 초기화하고 iCloud에서 다시 다운로드합니다. 계속하시겠습니까?";
"Recovery warning: local data will be erased" = "⚠️ 현재 기기의 모든 수집 기록이 삭제되고 iCloud 백업으로 교체됩니다. 이 작업은 되돌릴 수 없습니다.";
"Are you absolutely sure?" = "정말 진행하시겠습니까?";
"Recovery final confirm" = "마지막 확인입니다. 로컬 데이터가 iCloud 백업으로 완전히 대체됩니다. iCloud에 최신 백업이 있는지 반드시 확인하세요.";
"Recovery Complete" = "복구 완료";
"Please restart the app to complete data recovery from iCloud." = "iCloud에서 데이터 복구를 완료하려면 앱을 다시 시작해 주세요.";
"Recovery Failed" = "복구 실패";
"Clean duplicate data" = "중복/고아 데이터 정리";
"Consolidate warning" = "동기화 과정에서 생긴 중복 수집 기록을 하나로 합치고, 연결이 끊긴 데이터를 정리합니다. 동기화가 이상할 때만 사용하세요.";
"Restore from local backup" = "로컬 백업에서 복원";
"Local backup detected" = "로컬 백업이 감지됐어요";
"Local backup detected message" = "CloudKit 동기화로 로컬 데이터가 사라진 것 같습니다. %@에 저장된 로컬 백업(항목 %d개)에서 복원하시겠어요?\n\niCloud에서 가져오기를 기다려도 되고, 지금 바로 로컬 백업에서 복원해도 됩니다.";
"Wait for iCloud" = "iCloud 기다리기";
"Restore local backup" = "로컬 백업에서 복원";
"Restore complete" = "복원 완료";
"Restored %d items" = "%d개 항목을 복원했습니다.";
"Restore failed" = "복원 실패";
"No local backup found" = "저장된 로컬 백업이 없습니다.";
"Local backup info" = "마지막 로컬 백업";
"Local backup info format" = "%@ · 항목 %d개";
"No local backup" = "로컬 백업 없음";
"Restore local backup warning" = "현재 로컬 데이터를 %@에 저장된 백업으로 교체합니다 (항목 %d개). 계속하시겠어요?";
"iCloud sync status" = "iCloud 동기화";
"Syncing..." = "동기화 중...";
"Waiting for iCloud data..." = "iCloud 데이터 대기 중...";
Expand Down
Loading
Loading