All: Updated translations

CliClient/locales/de_DE.po

@@ -680,6 +680,16 @@ msgstr "Kann Synchronisierer nicht initialisieren."
 msgid "View them now"
 msgstr ""
 
+#, fuzzy
+msgid "Some items cannot be decrypted."
+msgstr "Kann Synchronisierer nicht initialisieren."
+
+msgid "Set the password"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
 msgid "ID"
 msgstr ""
 
@@ -694,6 +704,18 @@ msgstr "Erstellt: %d."
 msgid "Updated"
 msgstr "Aktualisiert: %d."
 
+msgid "Password"
+msgstr ""
+
+msgid "Password OK"
+msgstr ""
+
+msgid ""
+"Note: Only one master key is going to be used for encryption (the one marked "
+"as \"active\"). Any of the keys might be used for decryption, depending on "
+"how the notes or notebooks were originally encrypted."
+msgstr ""
+
 msgid "Add or remove tags"
 msgstr "Markierungen hinzufügen oder entfernen"
 
@@ -744,6 +766,9 @@ msgstr "Importieren"
 msgid "Synchronisation Status"
 msgstr "Synchronisationsziel"
 
+msgid "Master Keys"
+msgstr ""
+
 msgid "Remove this tag from all the notes?"
 msgstr "Diese Markierung von allen Notizen löschen?"
 
@@ -1110,10 +1135,6 @@ msgstr ""
 msgid "Welcome"
 msgstr "Wilkommen"
 
-#, fuzzy
-#~ msgid "Some items cannot be decrypted."
-#~ msgstr "Kann Synchronisierer nicht initialisieren."
-
 #~ msgid "Delete notebook?"
 #~ msgstr "Notizbuch löschen?"
 

CliClient/locales/en_GB.po

@@ -603,6 +603,15 @@ msgstr ""
 msgid "View them now"
 msgstr ""
 
+msgid "Some items cannot be decrypted."
+msgstr ""
+
+msgid "Set the password"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
 msgid "ID"
 msgstr ""
 
@@ -615,6 +624,18 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
+msgid "Password"
+msgstr ""
+
+msgid "Password OK"
+msgstr ""
+
+msgid ""
+"Note: Only one master key is going to be used for encryption (the one marked "
+"as \"active\"). Any of the keys might be used for decryption, depending on "
+"how the notes or notebooks were originally encrypted."
+msgstr ""
+
 msgid "Add or remove tags"
 msgstr ""
 
@@ -659,6 +680,9 @@ msgstr ""
 msgid "Synchronisation Status"
 msgstr ""
 
+msgid "Master Keys"
+msgstr ""
+
 msgid "Remove this tag from all the notes?"
 msgstr ""
 

CliClient/locales/es_CR.po

@@ -662,6 +662,16 @@ msgstr "No se puede inicializar sincronizador."
 msgid "View them now"
 msgstr ""
 
+#, fuzzy
+msgid "Some items cannot be decrypted."
+msgstr "No se puede inicializar sincronizador."
+
+msgid "Set the password"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
 msgid "ID"
 msgstr ""
 
@@ -676,6 +686,18 @@ msgstr "Creado: %d."
 msgid "Updated"
 msgstr "Actualizado: %d."
 
+msgid "Password"
+msgstr ""
+
+msgid "Password OK"
+msgstr ""
+
+msgid ""
+"Note: Only one master key is going to be used for encryption (the one marked "
+"as \"active\"). Any of the keys might be used for decryption, depending on "
+"how the notes or notebooks were originally encrypted."
+msgstr ""
+
 msgid "Add or remove tags"
 msgstr "Agregar o borrar etiquetas"
 
@@ -724,6 +746,9 @@ msgstr "Importar"
 msgid "Synchronisation Status"
 msgstr "Sincronización de objetivo"
 
+msgid "Master Keys"
+msgstr ""
+
 msgid "Remove this tag from all the notes?"
 msgstr "Remover esta etiqueta de todas las notas?"
 

CliClient/locales/fr_FR.po

@@ -659,6 +659,16 @@ msgstr "Impossible d'initialiser la synchronisation."
 msgid "View them now"
 msgstr ""
 
+#, fuzzy
+msgid "Some items cannot be decrypted."
+msgstr "Impossible d'initialiser la synchronisation."
+
+msgid "Set the password"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
 msgid "ID"
 msgstr ""
 
@@ -673,6 +683,18 @@ msgstr "Créés : %d."
 msgid "Updated"
 msgstr "Mis à jour : %d."
 
+msgid "Password"
+msgstr ""
+
+msgid "Password OK"
+msgstr ""
+
+msgid ""
+"Note: Only one master key is going to be used for encryption (the one marked "
+"as \"active\"). Any of the keys might be used for decryption, depending on "
+"how the notes or notebooks were originally encrypted."
+msgstr ""
+
 msgid "Add or remove tags"
 msgstr "Gérer les étiquettes"
 
@@ -723,6 +745,9 @@ msgstr "Importer"
 msgid "Synchronisation Status"
 msgstr "Cible de la synchronisation"
 
+msgid "Master Keys"
+msgstr ""
+
 msgid "Remove this tag from all the notes?"
 msgstr "Enlever cette étiquette de toutes les notes ?"
 
@@ -1077,10 +1102,6 @@ msgstr ""
 msgid "Welcome"
 msgstr "Bienvenue"
 
-#, fuzzy
-#~ msgid "Some items cannot be decrypted."
-#~ msgstr "Impossible d'initialiser la synchronisation."
-
 #~ msgid "Delete notebook?"
 #~ msgstr "Supprimer le carnet ?"
 

CliClient/locales/it_IT.po

@@ -659,6 +659,16 @@ msgstr "Alcuni elementi non possono essere sincronizzati."
 msgid "View them now"
 msgstr "Mostrali ora"
 
+#, fuzzy
+msgid "Some items cannot be decrypted."
+msgstr "Alcuni elementi non possono essere sincronizzati."
+
+msgid "Set the password"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
 msgid "ID"
 msgstr ""
 
@@ -673,6 +683,18 @@ msgstr "Creato: %d."
 msgid "Updated"
 msgstr "Aggiornato: %d."
 
+msgid "Password"
+msgstr ""
+
+msgid "Password OK"
+msgstr ""
+
+msgid ""
+"Note: Only one master key is going to be used for encryption (the one marked "
+"as \"active\"). Any of the keys might be used for decryption, depending on "
+"how the notes or notebooks were originally encrypted."
+msgstr ""
+
 msgid "Add or remove tags"
 msgstr "Aggiungi o rimuovi etichetta"
 
@@ -718,6 +740,9 @@ msgstr "Importa"
 msgid "Synchronisation Status"
 msgstr "Stato della Sincronizzazione"
 
+msgid "Master Keys"
+msgstr ""
+
 msgid "Remove this tag from all the notes?"
 msgstr "Rimuovere questa etichetta da tutte le note?"
 
@@ -1077,10 +1102,6 @@ msgstr ""
 msgid "Welcome"
 msgstr "Benvenuto"
 
-#, fuzzy
-#~ msgid "Some items cannot be decrypted."
-#~ msgstr "Alcuni elementi non possono essere sincronizzati."
-
 #~ msgid "Delete notebook?"
 #~ msgstr "Eliminare il blocco note?"
 

CliClient/locales/joplin.pot

@@ -603,6 +603,15 @@ msgstr ""
 msgid "View them now"
 msgstr ""
 
+msgid "Some items cannot be decrypted."
+msgstr ""
+
+msgid "Set the password"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
 msgid "ID"
 msgstr ""
 
@@ -615,6 +624,18 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
+msgid "Password"
+msgstr ""
+
+msgid "Password OK"
+msgstr ""
+
+msgid ""
+"Note: Only one master key is going to be used for encryption (the one marked "
+"as \"active\"). Any of the keys might be used for decryption, depending on "
+"how the notes or notebooks were originally encrypted."
+msgstr ""
+
 msgid "Add or remove tags"
 msgstr ""
 
@@ -659,6 +680,9 @@ msgstr ""
 msgid "Synchronisation Status"
 msgstr ""
 
+msgid "Master Keys"
+msgstr ""
+
 msgid "Remove this tag from all the notes?"
 msgstr ""
 

CliClient/locales/pt_BR.po

@@ -656,6 +656,16 @@ msgstr "Não é possível inicializar o sincronizador."
 msgid "View them now"
 msgstr ""
 
+#, fuzzy
+msgid "Some items cannot be decrypted."
+msgstr "Não é possível inicializar o sincronizador."
+
+msgid "Set the password"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
 msgid "ID"
 msgstr ""
 
@@ -670,6 +680,18 @@ msgstr "Criado: %d."
 msgid "Updated"
 msgstr "Atualizado: %d."
 
+msgid "Password"
+msgstr ""
+
+msgid "Password OK"
+msgstr ""
+
+msgid ""
+"Note: Only one master key is going to be used for encryption (the one marked "
+"as \"active\"). Any of the keys might be used for decryption, depending on "
+"how the notes or notebooks were originally encrypted."
+msgstr ""
+
 msgid "Add or remove tags"
 msgstr "Adicionar ou remover tags"
 
@@ -716,6 +738,9 @@ msgstr "Importar"
 msgid "Synchronisation Status"
 msgstr "Alvo de sincronização"
 
+msgid "Master Keys"
+msgstr ""
+
 msgid "Remove this tag from all the notes?"
 msgstr "Remover esta tag de todas as notas?"
 

ElectronClient/app/gui/ConfigScreen.jsx

@@ -22,6 +22,23 @@ class ConfigScreenComponent extends React.Component {
 		this.setState({ settings: this.props.settings });
 	}
 
+	keyValueToArray(kv) {
+		let output = [];
+		for (let k in kv) {
+			if (!kv.hasOwnProperty(k)) continue;
+			output.push({
+				key: k,
+				label: kv[k],
+			});
+		}
+
+		output.sort((a, b) => {
+			return a.label.toLowerCase() < b.label.toLowerCase() ? -1 : +1;
+		});
+
+		return output;
+	}
+
 	settingToComponent(key, value) {
 		const theme = themeStyle(this.props.theme);
 
@@ -53,9 +70,10 @@ class ConfigScreenComponent extends React.Component {
 		if (md.isEnum) {
 			let items = [];
 			const settingOptions = md.options();
-			for (let k in settingOptions) {
-				if (!settingOptions.hasOwnProperty(k)) continue;
-				items.push(<option value={k.toString()} key={k}>{settingOptions[k]}</option>);
+			let array = this.keyValueToArray(settingOptions);
+			for (let i = 0; i < array.length; i++) {
+				const e = array[i];
+				items.push(<option value={e.key.toString()} key={e.key}>{settingOptions[e.key]}</option>);
 			}
 
 			return (

ElectronClient/app/locales/index.js

@@ -2,7 +2,9 @@ var locales = {};
 locales['en_GB'] = require('./en_GB.json');
 locales['de_DE'] = require('./de_DE.json');
 locales['es_CR'] = require('./es_CR.json');
+locales['es_ES'] = require('./es_ES.json');
 locales['fr_FR'] = require('./fr_FR.json');
+locales['hr_HR'] = require('./hr_HR.json');
 locales['it_IT'] = require('./it_IT.json');
 locales['pt_BR'] = require('./pt_BR.json');
 module.exports = { locales: locales };

ReactNativeClient/lib/locale.js

@@ -172,6 +172,7 @@ codeToLanguage_["hu"] = "Magyar";
 
 let codeToCountry_ = {};
 codeToCountry_["BR"] = "Brasil";
+codeToCountry_["CR"] = "Costa Rica";
 codeToCountry_["CN"] = "中国";
 
 let supportedLocales_ = null;

ReactNativeClient/locales/index.js

@@ -2,7 +2,9 @@ var locales = {};
 locales['en_GB'] = require('./en_GB.json');
 locales['de_DE'] = require('./de_DE.json');
 locales['es_CR'] = require('./es_CR.json');
+locales['es_ES'] = require('./es_ES.json');
 locales['fr_FR'] = require('./fr_FR.json');
+locales['hr_HR'] = require('./hr_HR.json');
 locales['it_IT'] = require('./it_IT.json');
 locales['pt_BR'] = require('./pt_BR.json');
 module.exports = { locales: locales };