Merge branch 'main' into main

undefinedDarkness · Jul 4, 2022 · 34c4ff3 · 34c4ff3
2 parents 1272389 + d38b9aa
commit 34c4ff3
Show file tree

Hide file tree

Showing 41 changed files with 655 additions and 140 deletions.
diff --git a/art/custom_icons.svg b/art/custom_icons.svg
diff --git a/art/logo.svg b/art/logo.svg
diff --git a/lorien/Assets/I18n/de.txt b/lorien/Assets/I18n/de.txt
@@ -4,15 +4,14 @@ LANGUAGE_NAME Deutsch
 # Menu
 # --------------------------------------------------------------------------------
 
-MENU_OPEN           Öffnen
+MENU_OPEN           Öffnen...
 MENU_SAVE           Speichern
-MENU_SAVE_AS        Speichern als..
+MENU_SAVE_AS        Speichern als...
 MENU_SETTINGS       Einstellungen
 MENU_MANUAL         Benutzeranleitung
 MENU_BUG_TRACKER    Bug Tracker
 MENU_ABOUT          Über
-MENU_EXPORT         Exportieren
-MENU_EXPORT_PNG     Exportieren als PNG
+MENU_EXPORT         Exportieren...
 
 # -----------------------------------------------------------------------------
 # Toolbar

diff --git a/lorien/Assets/I18n/en.txt b/lorien/Assets/I18n/en.txt
@@ -4,15 +4,14 @@ LANGUAGE_NAME English
 # Menu strings
 # -----------------------------------------------------------------------------
 
-MENU_OPEN           Open
+MENU_OPEN           Open...
 MENU_SAVE           Save
-MENU_SAVE_AS        Save as..
+MENU_SAVE_AS        Save as...
 MENU_SETTINGS       Settings
 MENU_MANUAL         Manual
 MENU_BUG_TRACKER    Bug Tracker
 MENU_ABOUT          About
-MENU_EXPORT         Export
-MENU_EXPORT_PNG     Export Canvas as PNG
+MENU_EXPORT         Export...
 
 # -----------------------------------------------------------------------------
 # Toolbar
@@ -61,6 +60,7 @@ SETTINGS_TITLE                  Settings
 SETTINGS_GENERAL                General
 SETTINGS_APPEARANCE             Appearance
 SETTINGS_RENDERING              Rendering
+SETTINGS_KEYBINDINGS            Keybindings
 SETTINGS_PRESSURE_SENSITIVITY   Pressure Sensitivity
 SETTINGS_BRUSH_SIZE             Default Brush Size
 SETTINGS_CANVAS_COLOR           Default Canvas Color
@@ -138,3 +138,42 @@ SAVE            Save
 DISCARD         Discard
 CANCEL          Cancel
 DELETE          Delete
+
+# -----------------------------------------------------------------------------
+# Action names
+# -----------------------------------------------------------------------------
+
+ACTION_shortcut_save_project       Save project
+ACTION_shortcut_new_project        New Project
+ACTION_shortcut_open_project       Open Project
+ACTION_shortcut_undo               Undo
+ACTION_shortcut_redo               Redo
+ACTION_shortcut_brush_tool         Brush tool
+ACTION_shortcut_line_tool          Line tool
+ACTION_shortcut_eraser_tool        Eraser tool
+ACTION_shortcut_select_tool        Selection tool
+ACTION_shortcut_move_tool          Move tool
+ACTION_shortcut_rectangle_tool     Rectangle tool
+ACTION_shortcut_circle_tool        Circle tool
+ACTION_shortcut_export_project     Export project
+ACTION_deselect_all_strokes        Deselect all strokes
+ACTION_center_canvas_to_mouse      Space
+ACTION_delete_selected_strokes     Delete selected strokes
+ACTION_copy_strokes                Copy
+ACTION_paste_strokes               Paste
+ACTION_duplicate_strokes           Duplicate strokes
+ACTION_toggle_distraction_free_mode Toggle distraction free mode
+ACTION_toggle_player               EFF TWELVE
+ACTION_toggle_fullscreen           Toggle fullscreen
+
+# -----------------------------------------------------------------------------
+# Kebindings dialog messages
+# -----------------------------------------------------------------------------
+
+# Bind key dialog
+KEYBINDING_DIALOG_BIND_WINDOW_NAME     Bind key
+KEYBINDING_DIALOG_BIND_ACTION          Action: {action}
+
+# Rebind already bound key dialog
+KEYBINDING_DIALOG_REBIND_WINDOW_NAME   Rebind key?
+KEYBINDING_DIALOG_REBIND_MESSAGE       '{event}' already is bound to {action}.\n\nDo you want to rebind?
diff --git a/lorien/Assets/I18n/es.txt b/lorien/Assets/I18n/es.txt
@@ -4,17 +4,14 @@ LANGUAGE_NAME Español
 # Menu strings
 # -----------------------------------------------------------------------------
 
-MENU_OPEN           Abrir
+MENU_OPEN           Abrir...
 MENU_SAVE           Guardar
-MENU_SAVE_AS        Guardar como..
+MENU_SAVE_AS        Guardar como...
 MENU_SETTINGS       Configuración
 MENU_MANUAL         Manual
-# Changed from "Bug tracker" to "Report a bug"
 MENU_BUG_TRACKER    Reportar un error
-# Changed from "About" to "About Lorien"
 MENU_ABOUT          Acerca de Lorien
-MENU_EXPORT         Exportar
-MENU_EXPORT_PNG     Exportar Canvas como PNG
+MENU_EXPORT         Exportar...
 
 # -----------------------------------------------------------------------------
 # Toolbar

diff --git a/lorien/Assets/I18n/fr.txt b/lorien/Assets/I18n/fr.txt
@@ -4,15 +4,14 @@ LANGUAGE_NAME Français
 # Menu strings
 # -----------------------------------------------------------------------------
 
-MENU_OPEN           Ouvrir
+MENU_OPEN           Ouvrir...
 MENU_SAVE           Enregistrer
 MENU_SAVE_AS        Enregistrer sous...
 MENU_SETTINGS       Paramètres
 MENU_MANUAL         Documentation
 MENU_BUG_TRACKER    Suivi des bogues
 MENU_ABOUT          À propos
-MENU_EXPORT         Exporter
-MENU_EXPORT_PNG     Exporter la zone visible en PNG
+MENU_EXPORT         Exporter...
 
 # -----------------------------------------------------------------------------
 # Toolbar

diff --git a/lorien/Assets/I18n/it.txt b/lorien/Assets/I18n/it.txt
@@ -4,15 +4,14 @@ LANGUAGE_NAME Italiano
 # Menu
 # -----------------------------------------------------------------------------
 
-MENU_OPEN           Apri  
+MENU_OPEN           Apri...
 MENU_SAVE           Salva
-MENU_SAVE_AS        Salva come..
+MENU_SAVE_AS        Salva come...
 MENU_SETTINGS       Impostazioni
 MENU_MANUAL         Manuale
 MENU_BUG_TRACKER    Monitoraggio dei bug
 MENU_ABOUT          Informazioni
-MENU_EXPORT         Esporta
-MENU_EXPORT_PNG     Esporta Tela come PNG
+MENU_EXPORT         Esporta...
 
 # -----------------------------------------------------------------------------
 # Toolbar

diff --git a/lorien/Assets/I18n/ko.txt b/lorien/Assets/I18n/ko.txt
@@ -4,15 +4,14 @@ LANGUAGE_NAME 한국어
 # Menu strings
 # -----------------------------------------------------------------------------
 
-MENU_OPEN           열기
+MENU_OPEN           열기...
 MENU_SAVE           저장
-MENU_SAVE_AS        다른 이름으로 저장..
+MENU_SAVE_AS        다른 이름으로 저장...
 MENU_SETTINGS       설정
 MENU_MANUAL         설명서
 MENU_BUG_TRACKER    버그 제보
 MENU_ABOUT          정보
-MENU_EXPORT         내보내기
-MENU_EXPORT_PNG     PNG 파일로 내보내기
+MENU_EXPORT         내보내기...
 
 # -----------------------------------------------------------------------------
 # Toolbar
@@ -94,14 +93,14 @@ ABOUT_DIALOG_EASTEREGG          이스터에그:
 # -----------------------------------------------------------------------------
 
 UNSAVED_CHANGES_DIALOG_TITLE    변경사항을 저장할까요?
-UNSAVED_CHANGES_DIALOG_TEXT     파일을 닫기전에 저장할까요?
+UNSAVED_CHANGES_DIALOG_TEXT     파일을 닫기 전에 저장할까요?
 
 # -----------------------------------------------------------------------------
 # Exit dialog
 # -----------------------------------------------------------------------------
 
 EXIT_DIALOG_TITLE    변경사항을 저장할까요?
-EXIT_DIALOG_TEXT     Lorien을 나가지전에 저장할까요?
+EXIT_DIALOG_TEXT     Lorien을 나가기 전에 저장할까요?
 
 # -----------------------------------------------------------------------------
 # New palette dialog