mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 10:26:08 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/main' into react/note_context_aware
This commit is contained in:
		| @@ -16,7 +16,7 @@ const UNSORTED_LOCALES: Locale[] = [ | ||||
|     { id: "es", name: "Español", electronLocale: "es" }, | ||||
|     { id: "fr", name: "Français", electronLocale: "fr" }, | ||||
|     { id: "ja", name: "日本語", electronLocale: "ja" }, | ||||
|     { id: "pt_BR", name: "Português (Brasil)", electronLocale: "pt-BR" }, | ||||
|     { id: "pt_br", name: "Português (Brasil)", electronLocale: "pt-BR" }, | ||||
|     { id: "ro", name: "Română", electronLocale: "ro" }, | ||||
|     { id: "ru", name: "Русский", electronLocale: "ru" }, | ||||
|     { id: "tw", name: "繁體中文", electronLocale: "zh_TW" }, | ||||
|   | ||||
		Reference in New Issue
	
	Block a user