diff --git a/MacBox/nb/MacConflictResolutionWizard.strings b/MacBox/nb/MacConflictResolutionWizard.strings
index 49475e45f..1c67f0d8b 100644
--- a/MacBox/nb/MacConflictResolutionWizard.strings
+++ b/MacBox/nb/MacConflictResolutionWizard.strings
@@ -8,10 +8,10 @@
 "Enn-rk-tNB.title" = "Always Auto-Merge";
 
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "P6M-78-D7f"; */
-"P6M-78-D7f.title" = "Cancel";
+"P6M-78-D7f.title" = "Avbryt";
 
 /* Class = "NSTextFieldCell"; title = "Advanced Options"; ObjectID = "THD-bt-CCU"; */
-"THD-bt-CCU.title" = "Advanced Options";
+"THD-bt-CCU.title" = "Avanserte valg";
 
 /* Class = "NSButtonCell"; title = "Force Push My Changes"; ObjectID = "Us7-Cg-cqA"; */
 "Us7-Cg-cqA.title" = "Force Push My Changes";
@@ -29,4 +29,4 @@
 "tGT-J0-4YV.title" = "Sync Later";
 
 /* Class = "NSTextFieldCell"; title = "What would you like to do?"; ObjectID = "wzL-fO-mIy"; */
-"wzL-fO-mIy.title" = "What would you like to do?";
+"wzL-fO-mIy.title" = "Hva ønsker du å gjøre?";