Skip to content

Commit b100532

Browse files
committed
feat: display conflict copies in browser
1 parent a0cf917 commit b100532

File tree

8 files changed

+372
-646
lines changed

8 files changed

+372
-646
lines changed

Localizable.xcstrings

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4026,6 +4026,40 @@
40264026
}
40274027
}
40284028
},
4029+
"Conflicting versions of this file" : {
4030+
"localizations" : {
4031+
"de" : {
4032+
"stringUnit" : {
4033+
"state" : "translated",
4034+
"value" : "Konfliktierende Versionen dieser Datei"
4035+
}
4036+
},
4037+
"es" : {
4038+
"stringUnit" : {
4039+
"state" : "translated",
4040+
"value" : "Versiones en conflicto de este archivo"
4041+
}
4042+
},
4043+
"it" : {
4044+
"stringUnit" : {
4045+
"state" : "translated",
4046+
"value" : "Versioni conflittuali di questo file"
4047+
}
4048+
},
4049+
"nl" : {
4050+
"stringUnit" : {
4051+
"state" : "translated",
4052+
"value" : "Conflicterende versies van dit bestand"
4053+
}
4054+
},
4055+
"uk" : {
4056+
"stringUnit" : {
4057+
"state" : "translated",
4058+
"value" : "Конфліктуючі версії цього файлу"
4059+
}
4060+
}
4061+
}
4062+
},
40294063
"Connected" : {
40304064
"localizations" : {
40314065
"de" : {

0 commit comments

Comments
 (0)