Pier Angelo Vendrame pushed to branch mullvad-browser-137.0a1-15.0-1 at The Tor Project / Applications / Mullvad Browser

Commits:

2 changed files:

Changes:

  • browser/locales/l10n.toml
    ... ... @@ -131,6 +131,18 @@ locales = [
    131 131
         reference = "browser/branding/official/locales/en-US/**"
    
    132 132
         l10n = "{l}browser/branding/official/**"
    
    133 133
     
    
    134
    +[[paths]]
    
    135
    +    reference = "browser/branding/mb-alpha/locales/en-US/**"
    
    136
    +    l10n = "{l}browser/branding/mb-alpha/**"
    
    137
    +
    
    138
    +[[paths]]
    
    139
    +    reference = "browser/branding/mb-nightly/locales/en-US/**"
    
    140
    +    l10n = "{l}browser/branding/mb-nightly/**"
    
    141
    +
    
    142
    +[[paths]]
    
    143
    +    reference = "browser/branding/mb-release/locales/en-US/**"
    
    144
    +    l10n = "{l}browser/branding/mb-release/**"
    
    145
    +
    
    134 146
     [[paths]]
    
    135 147
         reference = "browser/extensions/formautofill/locales/en-US/**"
    
    136 148
         l10n = "{l}browser/extensions/formautofill/**"
    

  • other-licenses/nsis/Contrib/ApplicationID/Set.cpp
    ... ... @@ -35,7 +35,8 @@ unsigned int g_stringsize;
    35 35
     TCHAR *g_variables;
    
    36 36
     
    
    37 37
     // Indicates that an application supports dual desktop and immersive modes. In Windows 8, this property is only applicable for web browsers.
    
    38
    -DEFINE_PROPERTYKEY(PKEY_AppUserModel_IsDualMode, 0x9F4C2855, 0x9F79, 0x4B39, 0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3, 11);
    
    38
    +// mingw already defines this in propkey.h.
    
    39
    +// DEFINE_PROPERTYKEY(PKEY_AppUserModel_IsDualMode, 0x9F4C2855, 0x9F79, 0x4B39, 0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3, 11);
    
    39 40
     
    
    40 41
     int popstring(TCHAR *str, int len);
    
    41 42
     void pushstring(const TCHAR *str, int len);