Skip to content

Commit

Permalink
merge conflict adaptions
Browse files Browse the repository at this point in the history
  • Loading branch information
Schr0eder committed Mar 11, 2024
1 parent fd6baa8 commit f58fced
Showing 1 changed file with 36 additions and 0 deletions.
36 changes: 36 additions & 0 deletions Xcodes/Resources/Localizable.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -1154,6 +1154,12 @@
"comment" : "Cancel Runtime Install",
"extractionState" : "manual",
"localizations" : {
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Bist du sicher, dass Du die Installation von Xcode %@ anhalten möchtest?"
}
},
"el" : {
"stringUnit" : {
"state" : "translated",
Expand Down Expand Up @@ -1321,6 +1327,12 @@
"Alert.DeletePlatform.PrimaryButton" : {
"extractionState" : "manual",
"localizations" : {
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Löschen"
}
},
"el" : {
"stringUnit" : {
"state" : "translated",
Expand Down Expand Up @@ -1362,6 +1374,12 @@
"Alert.DeletePlatform.Title" : {
"extractionState" : "manual",
"localizations" : {
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Bist du sicher, dass du %@ löschen möchtest?"
}
},
"el" : {
"stringUnit" : {
"state" : "translated",
Expand Down Expand Up @@ -15470,6 +15488,12 @@
},
"Perform post-install steps" : {
"localizations" : {
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Führe Post-Installationsschritte durch"
}
},
"el" : {
"stringUnit" : {
"state" : "translated",
Expand Down Expand Up @@ -15510,6 +15534,12 @@
},
"Platforms" : {
"localizations" : {
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Plattformen"
}
},
"el" : {
"stringUnit" : {
"state" : "translated",
Expand Down Expand Up @@ -15545,6 +15575,12 @@
"PlatformsList.Title" : {
"extractionState" : "manual",
"localizations" : {
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Hier siehst du eine Liste der auf diesem Rechner installierten Plattformen."
}
},
"el" : {
"stringUnit" : {
"state" : "translated",
Expand Down

0 comments on commit f58fced

Please sign in to comment.