Fixed renaming 'no' locale to 'nb_NO'

CliClient/locales/nb_NO.po

@@ -15,8 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
 
 msgid "To delete a tag, untag the associated notes."
 msgstr ""
@@ -1750,4 +1748,3 @@ msgstr "Du har enda ingen notatbok. Lag en ved å klikke på (+)-knappen."
 
 msgid "Welcome"
 msgstr "Velkommen"
-

ElectronClient/app/locales/index.js

@@ -12,9 +12,9 @@ locales['hr_HR'] = require('./hr_HR.json');
 locales['it_IT'] = require('./it_IT.json');
 locales['ja_JP'] = require('./ja_JP.json');
 locales['ko'] = require('./ko.json');
+locales['nb_NO'] = require('./nb_NO.json');
 locales['nl_BE'] = require('./nl_BE.json');
 locales['nl_NL'] = require('./nl_NL.json');
-locales['no'] = require('./no.json');
 locales['pt_BR'] = require('./pt_BR.json');
 locales['ro'] = require('./ro.json');
 locales['ru_RU'] = require('./ru_RU.json');

README.md

@@ -319,6 +319,7 @@ Current translations:
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 &nbsp;  |  Language  |  Po File  |  Last translator  |  Percent done
 ---|---|---|---|---
+![](https://joplin.cozic.net/images/flags/country-4x3/no.png)  |    |  [nb_NO](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nb_NO.po)  |  Mats Estensen (matsest@mxe.no)  |  100%
 ![](https://joplin.cozic.net/images/flags/es/basque_country.png)  |  Basque  |  [eu](https://github.com/laurent22/joplin/blob/master/CliClient/locales/eu.po)  |  juan.abasolo@ehu.eus  |  61%
 ![](https://joplin.cozic.net/images/flags/es/catalonia.png)  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ca.po)  |  jmontane, 2018  |  87%
 ![](https://joplin.cozic.net/images/flags/country-4x3/hr.png)  |  Croatian  |  [hr_HR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/hr_HR.po)  |  Hrvoje Mandić (trbuhom@net.hr)  |  49%
@@ -332,7 +333,6 @@ Current translations:
 ![](https://joplin.cozic.net/images/flags/country-4x3/it.png)  |  Italiano  |  [it_IT](https://github.com/laurent22/joplin/blob/master/CliClient/locales/it_IT.po)  |    |  92%
 ![](https://joplin.cozic.net/images/flags/country-4x3/nl.png)  |  Nederlands  |  [nl_NL](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_NL.po)  |  Heimen Stoffels (vistausss@outlook.com)  |  93%
 ![](https://joplin.cozic.net/images/flags/country-4x3/be.png)  |  Nederlands  |  [nl_BE](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_BE.po)  |    |  61%
-![](https://joplin.cozic.net/images/flags/country-4x3/no.png)  |  Norwegian  |  [nb_NO](https://github.com/laurent22/joplin/blob/master/CliClient/locales/nb_NO.po)  | Mats Estensen (matsest@mxe.no)  |  100%
 ![](https://joplin.cozic.net/images/flags/country-4x3/br.png)  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/master/CliClient/locales/pt_BR.po)  |  Renato Nunes Bastos (rnbastos@gmail.com)  |  100%
 ![](https://joplin.cozic.net/images/flags/country-4x3/ro.png)  |  Română  |  [ro](https://github.com/laurent22/joplin/blob/master/CliClient/locales/ro.po)  |    |  61%
 ![](https://joplin.cozic.net/images/flags/country-4x3/si.png)  |  Slovenian  |  [sl_SI](https://github.com/laurent22/joplin/blob/master/CliClient/locales/sl_SI.po)  |    |  76%

ReactNativeClient/locales/index.js

@@ -12,9 +12,9 @@ locales['hr_HR'] = require('./hr_HR.json');
 locales['it_IT'] = require('./it_IT.json');
 locales['ja_JP'] = require('./ja_JP.json');
 locales['ko'] = require('./ko.json');
+locales['nb_NO'] = require('./nb_NO.json');
 locales['nl_BE'] = require('./nl_BE.json');
 locales['nl_NL'] = require('./nl_NL.json');
-locales['no'] = require('./no.json');
 locales['pt_BR'] = require('./pt_BR.json');
 locales['ro'] = require('./ro.json');
 locales['ru_RU'] = require('./ru_RU.json');

Tools/build-translation.js

@@ -161,7 +161,7 @@ function flagImageUrl(locale) {
 	if (locale === 'ca') return baseUrl + '/es/catalonia.png';
 	if (locale === 'ko') return baseUrl + '/country-4x3/kr.png';
 	if (locale === 'sv') return baseUrl + '/country-4x3/se.png';
-	if (locale === 'no') return baseUrl + '/country-4x3/no.png';
+	if (locale === 'nb_NO') return baseUrl + '/country-4x3/no.png';
 	if (locale === 'ro') return baseUrl + '/country-4x3/ro.png';
 	return baseUrl + '/country-4x3/' + countryCodeOnly(locale).toLowerCase() + '.png'
 }
@@ -222,6 +222,9 @@ async function main() {
 	let locales = availableLocales(defaultLocale);
 	for (let i = 0; i < locales.length; i++) {
 		const locale = locales[i];
+
+		console.info('Building ' + locale + '...');
+
 		const poFilePäth = cliLocalesDir + '/' + locale + '.po';
 		const jsonFilePath = jsonLocalesDir + '/' + locale + '.json';
 		if (locale != defaultLocale) await mergePotToPo(potFilePath, poFilePäth);

docs/index.html

@@ -511,6 +511,13 @@ $$
 </thead>
 <tbody>
 <tr>
+<td><img src="https://joplin.cozic.net/images/flags/country-4x3/no.png" alt=""></td>
+<td></td>
+<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/nb_NO.po">nb_NO</a></td>
+<td>Mats Estensen (matsest@mxe.no)</td>
+<td>100%</td>
+</tr>
+<tr>
 <td><img src="https://joplin.cozic.net/images/flags/es/basque_country.png" alt=""></td>
 <td>Basque</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/eu.po">eu</a></td>
@@ -602,13 +609,6 @@ $$
 <td>61%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/country-4x3/no.png" alt=""></td>
-<td>Norwegian</td>
-<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/nb_NO.po">no</a></td>
-<td></td>
-<td>83%</td>
-</tr>
-<tr>
 <td><img src="https://joplin.cozic.net/images/flags/country-4x3/br.png" alt=""></td>
 <td>Português (Brasil)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/pt_BR.po">pt_BR</a></td>