Minor clean-ups

Definitons.yaml: Changed the intent prefix "plus" from "positive" to "pluss". We for example say "plus infinity" and not "positive infinity".

Cleaned up some comments.

Author: MartheGjelstad

Rules/Languages/nb/ClearSpeak_Rules.yaml

@@ -513,7 +513,7 @@
 #  # note that *[2] is an mrow with X, ",", Y, so getting X or Y is a double index
     # onto the [not] [including]... part
 
- # SWEDISH/NORWEGIAN: rewrote the intervals function to better deal with Swedish convention of speaking intervals
+ # SWEDISH/NORWEGIAN: rewrote the intervals function to better deal with Swedish/Norwegian convention of speaking intervals
  # NORWEGIAN: Removed test for verbosity, cause you should always say "det åpne" etc.
 - name: ClearSpeak-intervals # avoid overriding with default "intervals" name
   variables:

Rules/Languages/nb/SharedRules/default.yaml

@@ -203,14 +203,14 @@
           - x: "*[last()]"
           # - t: "power"                    # phrase(5 raised to the second 'power' equals 25)
 
-#NORWEGIAN: Changed to English version. Think it sounds better when I tried navigation in character mode. 
+#NORWEGIAN: Changed to English version. Sounds better when navigating in character mode. 
 - name: default
   tag: munder
   match: "."
   replace:
   - test:
       if: "not(IsNode(*[1], 'leaf'))"
-      then: [T: "uttrykk"]      # phrase(phrase(x 'modified' with y above it)   #NORWEGIAN: Can't find a way to trigger this statement. Not sure if the translation is correct. 
+      then: [T: "uttrykk"]      # phrase(phrase(x 'modified' with y above it)   #NORWEGIAN: Can't find a way to trigger this expression. Not sure if the translation is correct. 
   - x: "*[1]"
   - pause: short
   - T: "med"      # phrase(x 'with' z below it)
@@ -225,29 +225,29 @@
   - x: "*[1]"
   - x: "*[2]"
 
-#NORWEGIAN: Changed to English version. Think it sounds better when I tried navigation in character mode. 
+#NORWEGIAN: Changed to English version. Sounds better when navigating in character mode. 
 - name: default
   tag: mover
   match: "."
   replace:
   - test:
       if: "not(IsNode(*[1], 'leaf'))"
-      then: [T: "uttrykk"]      # phrase(phrase(x 'modified' with y above it)    #NORWEGIAN: Can't find a way to trigger this statement. Not sure if the translation is correct. 
+      then: [T: "uttrykk"]      # phrase(phrase(x 'modified' with y above it)    #NORWEGIAN: Can't find a way to trigger this expression. Not sure if the translation is correct. 
   - x: "*[1]"
   - pause: short
   - T: "med"         # phrase(x modified 'with' y above it)
   - x: "*[2]"
   - T: "over"        # phrase(x modified 'with' y above it)
   - pause: short
 
-#NORWEGIAN: Changed to English version. Think it sounds better when I tried navigation in character mode
+#NORWEGIAN: Changed to English version. Sounds better when navigating in character mode
 - name: default
   tag: munderover
   match: "."
   replace:
   - test:
       if: "not(IsNode(*[1], 'leaf'))"
-      then: [T: "uttrykk"]      # phrase(the equation has been 'modified')      #NORWEGIAN: Can't find a way to trigger this statement. Not sure if the translation is correct. 
+      then: [T: "uttrykk"]      # phrase(the equation has been 'modified')      #NORWEGIAN: Can't find a way to trigger this expression. Not sure if the translation is correct. 
   - x: "*[1]"
   - T: "med"         # phrase(x modified 'with' y above it)
   - x: "*[2]"

Rules/Languages/nb/SharedRules/general.yaml

@@ -214,7 +214,7 @@
   #match: "."
   #replace:
   #- x: "*[1]"
-  #- t: "med repeterende siffer"      # phrase('with repeating digits')
+  #- T: "med repeterende siffer"      # phrase('with repeating digits')
   #- spell: "*[2]"
 
 - name: msubsup-skip-super

Rules/Languages/nb/SimpleSpeak_Rules.yaml

@@ -187,7 +187,7 @@
 
 - name: simple-integer
   tag: power
-  match: "*[2][self::m:mn][not(contains(., '.'))]"
+  match: "*[2][self::m:mn][not(contains(., '.'))]"         #Norwegian: Here the decimal point should probably be comma
   replace:
   - x: "*[1]"
   - T: "opphøyd i"
@@ -198,7 +198,7 @@
   tag: power
   match:
   - "*[2][self::m:minus and count(*)=1 and"
-  - "     *[1][self::m:mn][not(contains(., '.'))]]"
+  - "     *[1][self::m:mn][not(contains(., '.'))]]"      #Norwegian: Here the decimal point should probably be comma
   replace:
   - x: "*[1]"
   - T: "opphøyd i"

Rules/Languages/nb/definitions.yaml

@@ -29,7 +29,7 @@
     "logarithm-with-base": "prefix=log med grunntall: logaritmen med grunntall: logaritmen med grunntall",
     #"natural-logarithm": "function=l n: den naturlige logaritmen: den naturlige logaritmen",
     "minus": "infix=minus || prefix=minus",
-    "plus": "infix=pluss || prefix=positiv",
+    "plus": "infix=pluss || prefix=pluss",
     #"real-part": "function=realdelen",
 
     "transpose": "postfix=transponert || function=transponert",
@@ -139,7 +139,7 @@
     # time
     "″": "sekund", "\"": "sekund",
     "′": "minutt", "'": "minutt", "min": "minutt",
-    "h": "time", "hr": "time", "Hr": "time", "t": "time",     #t used often for hour in Norwegian, but t is officially the symbol for "tonn"
+    "h": "time", "hr": "time", "Hr": "time", "t": "time",     #NORWEGIAN: t is often used for hour, but t is officially the symbol for "tonn"
     "d": "dag", "dy": "dag",                                
     "w": "uke", "wk": "uke",                    
     "y": "år", "yr": "år",                                  
@@ -152,14 +152,14 @@
     "MOA": "bueminutt",                                    
     "arcsec": "buesekund",
     "asec": "buesekund",
-    "as": "buesekund",           #Also a used symbol in Norwegian
+    "as": "buesekund",           #NORWEGIAN: Also a used symbol
 
     # distance
     "au": "astronomisk enhet", "AU": "astronomisk enhet", "a.u.": "astronomisk enhet",
     "ltyr": "lysår", "ly": "lysår", "l.y.": "lysår",
     "pc": "parsec",
     "Å": "ångstrøm", "Å": "ångstrøm",           # U+00C5 and U+212B
-    "fm": "fermi",                              #Norwegian: F is the official symbol for "fermi", but this is also the symbol for Farad...
+    "fm": "fermi",                              #Norwegian: F is the official symbol for "fermi", but this is also the symbol for "Farad"...
 
     # others
     "ha": "hektar",

Rules/Languages/nb/unicode.yaml

@@ -31,11 +31,11 @@
 
  - "0-9": [T: "."]                               #  (en: '.', google: 'A')
 
- - " ": [T: " "]                     # 0x20      #Added from English version. Not in Swedish version
+ - " ": [T: " "]                     # 0x20      #NORWEGIAN: Added from English version. Not in Swedish version.
 
  - "!":                                          #  0x21
     - test:
-        if: "ancestor-or-self::*[contains(@data-intent-property, ':literal:')]"  #Norwegian: Changed from ":structure" to be equal to English translation
+        if: "ancestor-or-self::*[contains(@data-intent-property, ':literal:')]"  #NORWEGIAN: Changed from ":structure" to be equal to English translation
         then_test:
             if: "$Verbosity = 'Terse'"
             then: [T: "utropstegn"]            #  0x21 (en: 'bang', google translation)
@@ -170,7 +170,7 @@
  - "~": [T: "tilde"]                             #  0x7e
  - " ":                                          #  0xa0
     - test:
-        if: "@data-empty-in-2D and not(ancestor::*[self::m:piecewise or self::m:system-of-equations or self::m:lines])"   #Changed to English version. Now it doesn't speak "tom tom" for continued_row
+        if: "@data-empty-in-2D and not(ancestor::*[self::m:piecewise or self::m:system-of-equations or self::m:lines])"   #NORWEGIAN: Changed to English version. Now it doesn't speak "tom tom" for continued_row
         then: [T: "tom"]                       #  want to say something for fraction (etc) with empty child (en: 'empty', google translation)
         else: [T: ""]