Merge remote-tracking branch 'upstream/master' into jp

[winmerge-jp/winmerge-jp.git] / Translations / WinMerge / Norwegian.po

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index 4ba655c..8f27576 100644 (file)
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -478,8 +478,17 @@ msgstr "Vis sk&julte objekter"
 msgid "Tree &Mode"
 msgstr "Tre&modus"
 
-msgid "E&xpand All Subfolders"
-msgstr "&Utvid alle undermapper"
+msgid "E&xpand Subfolders"
+msgstr ""
+
+msgid "&All Subfolders"
+msgstr ""
+
+msgid "&Different Subfolders"
+msgstr ""
+
+msgid "&Identical Subfolders"
+msgstr ""
 
 msgid "&Collapse All Subfolders"
 msgstr "Sammen&trekk alle undermapper"
@@ -1982,10 +1991,10 @@ msgstr "S&topp etter første forskjell"
 msgid "Ign&ore time differences less than 3 seconds"
 msgstr "Ign&orer tidsforskjeller mindre enn 3 sekunder"
 
-msgid "Include &unique subfolders contents"
+msgid "&Automatically expand subfolders after comparison:"
 msgstr ""
 
-msgid "&Automatically expand all subfolders"
+msgid "Include &unique subfolders contents"
 msgstr ""
 
 msgid "Ignore &reparse points"
@@ -2293,6 +2302,18 @@ msgstr "HTML-filer (*.htm,*.html)|*.htm;*.html|Alle filer (*.*)|*.*||"
 msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
 msgstr "XML-filer (*.xml)|*.xml|Alle filer (*.*)|*.*||"
 
+msgid "Do not expand"
+msgstr ""
+
+msgid "Expand all subfolders"
+msgstr ""
+
+msgid "Expand different subfolders"
+msgstr ""
+
+msgid "Expand identical subfolders"
+msgstr ""
+
 msgid "File Type"
 msgstr ""