Skip to content

Commit

Permalink
Final bit of refactoring to get the key rebinding code up to scratch
Browse files Browse the repository at this point in the history
One last update of the locale files
  • Loading branch information
hhyyrylainen committed Dec 8, 2020
1 parent de56d98 commit c6284ff
Show file tree
Hide file tree
Showing 28 changed files with 552 additions and 378 deletions.
1 change: 1 addition & 0 deletions Thrive.sln.DotSettings
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArgumentDefaultValue/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantDefaultMemberInitializer/@EntryIndexedValue">HINT</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitArraySize/@EntryIndexedValue">SUGGESTION</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantVerbatimPrefix/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SA1615/@EntryIndexedValue">SUGGESTION</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SA1618/@EntryIndexedValue">SUGGESTION</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SafeCastIsUsedAsTypeCheck/@EntryIndexedValue">WARNING</s:String>
Expand Down
27 changes: 16 additions & 11 deletions locale/bg.po
Original file line number Diff line number Diff line change
Expand Up @@ -866,7 +866,12 @@ msgstr "популация в зоните:"
msgid "LOADING"
msgstr "Зареждане"

#: ../src/engine/input/key_mapping/InputGroupList.cs:166
#: ../src/engine/input/key_mapping/InputEventItem.cs:284
#, fuzzy
msgid "PRESS_KEY_DOT_DOT_DOT"
msgstr "..."

#: ../src/engine/input/key_mapping/InputGroupList.cs:164
msgid "KEY_BINDING_CHANGE_CONFLICT"
msgstr ""

Expand All @@ -883,44 +888,44 @@ msgstr "АТФ"
msgid "SHIFT"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:63
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:68
msgid "LEFT_MOUSE"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:64
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:69
msgid "RIGHT_MOUSE"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:65
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:70
msgid "MIDDLE_MOUSE"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:66
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:71
msgid "WHEEL_UP"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:67
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:72
msgid "WHEEL_DOWN"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:68
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:73
msgid "WHEEL_LEFT"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:69
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:74
#, fuzzy
msgid "WHEEL_RIGHT"
msgstr "Светлина"

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:70
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:75
msgid "SPECIAL_MOUSE_1"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:71
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:76
msgid "SPECIAL_MOUSE_2"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:72
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:77
msgid "UNKNOWN_MOUSE"
msgstr ""

Expand Down
26 changes: 15 additions & 11 deletions locale/ca.po
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,11 @@ msgstr ""
msgid "LOADING"
msgstr ""

#: ../src/engine/input/key_mapping/InputGroupList.cs:166
#: ../src/engine/input/key_mapping/InputEventItem.cs:284
msgid "PRESS_KEY_DOT_DOT_DOT"
msgstr ""

#: ../src/engine/input/key_mapping/InputGroupList.cs:164
msgid "KEY_BINDING_CHANGE_CONFLICT"
msgstr ""

Expand All @@ -836,43 +840,43 @@ msgstr ""
msgid "SHIFT"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:63
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:68
msgid "LEFT_MOUSE"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:64
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:69
msgid "RIGHT_MOUSE"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:65
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:70
msgid "MIDDLE_MOUSE"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:66
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:71
msgid "WHEEL_UP"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:67
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:72
msgid "WHEEL_DOWN"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:68
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:73
msgid "WHEEL_LEFT"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:69
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:74
msgid "WHEEL_RIGHT"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:70
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:75
msgid "SPECIAL_MOUSE_1"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:71
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:76
msgid "SPECIAL_MOUSE_2"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:72
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:77
msgid "UNKNOWN_MOUSE"
msgstr ""

Expand Down
27 changes: 16 additions & 11 deletions locale/cs.po
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,12 @@ msgstr ""
msgid "LOADING"
msgstr "Načítání"

#: ../src/engine/input/key_mapping/InputGroupList.cs:166
#: ../src/engine/input/key_mapping/InputEventItem.cs:284
#, fuzzy
msgid "PRESS_KEY_DOT_DOT_DOT"
msgstr "..."

#: ../src/engine/input/key_mapping/InputGroupList.cs:164
msgid "KEY_BINDING_CHANGE_CONFLICT"
msgstr ""

Expand All @@ -792,43 +797,43 @@ msgstr ""
msgid "SHIFT"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:63
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:68
msgid "LEFT_MOUSE"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:64
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:69
msgid "RIGHT_MOUSE"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:65
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:70
msgid "MIDDLE_MOUSE"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:66
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:71
msgid "WHEEL_UP"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:67
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:72
msgid "WHEEL_DOWN"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:68
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:73
msgid "WHEEL_LEFT"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:69
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:74
msgid "WHEEL_RIGHT"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:70
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:75
msgid "SPECIAL_MOUSE_1"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:71
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:76
msgid "SPECIAL_MOUSE_2"
msgstr ""

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:72
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:77
msgid "UNKNOWN_MOUSE"
msgstr ""

Expand Down
28 changes: 17 additions & 11 deletions locale/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,12 @@ msgstr "Population in Gebieten:"
msgid "LOADING"
msgstr "Lädt"

#: ../src/engine/input/key_mapping/InputGroupList.cs:166
#: ../src/engine/input/key_mapping/InputEventItem.cs:284
#, fuzzy
msgid "PRESS_KEY_DOT_DOT_DOT"
msgstr "..."

#: ../src/engine/input/key_mapping/InputGroupList.cs:164
msgid "KEY_BINDING_CHANGE_CONFLICT"
msgstr ""

Expand All @@ -898,43 +903,44 @@ msgstr "ATP"
msgid "SHIFT"
msgstr "Shift+"

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:63
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:68
msgid "LEFT_MOUSE"
msgstr "Linke Maus"

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:64
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:69
msgid "RIGHT_MOUSE"
msgstr "Rechte Maus"

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:65
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:70
msgid "MIDDLE_MOUSE"
msgstr "Mittlere Maus"

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:66
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:71
msgid "WHEEL_UP"
msgstr "Mausrad hoch"

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:67
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:72
msgid "WHEEL_DOWN"
msgstr "Mausrad runter"

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:68
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:73
msgid "WHEEL_LEFT"
msgstr "Mausrad links"

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:69
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:74
#, fuzzy
msgid "WHEEL_RIGHT"
msgstr "Mausrad rechts"

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:70
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:75
msgid "SPECIAL_MOUSE_1"
msgstr "Spezialmaus 1"

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:71
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:76
msgid "SPECIAL_MOUSE_2"
msgstr "Spezialmaus 2"

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:72
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:77
msgid "UNKNOWN_MOUSE"
msgstr "Unbekannte Maus"

Expand Down
26 changes: 15 additions & 11 deletions locale/en.po
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,11 @@ msgstr "population in patches:"
msgid "LOADING"
msgstr "Loading"

#: ../src/engine/input/key_mapping/InputGroupList.cs:166
#: ../src/engine/input/key_mapping/InputEventItem.cs:284
msgid "PRESS_KEY_DOT_DOT_DOT"
msgstr "Press a key..."

#: ../src/engine/input/key_mapping/InputGroupList.cs:164
msgid "KEY_BINDING_CHANGE_CONFLICT"
msgstr ""
"There is a conflict with {0}.\n"
Expand All @@ -865,43 +869,43 @@ msgstr "Alt"
msgid "SHIFT"
msgstr "Shift"

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:63
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:68
msgid "LEFT_MOUSE"
msgstr "Left mouse"

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:64
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:69
msgid "RIGHT_MOUSE"
msgstr "Right mouse"

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:65
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:70
msgid "MIDDLE_MOUSE"
msgstr "Middle mouse"

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:66
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:71
msgid "WHEEL_UP"
msgstr "Wheel up"

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:67
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:72
msgid "WHEEL_DOWN"
msgstr "Wheel down"

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:68
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:73
msgid "WHEEL_LEFT"
msgstr "Wheel left"

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:72
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:74
msgid "WHEEL_RIGHT"
msgstr "Wheel right"

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:70
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:75
msgid "SPECIAL_MOUSE_1"
msgstr "Special 1 mouse"

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:71
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:76
msgid "SPECIAL_MOUSE_2"
msgstr "Special 2 mouse"

#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:72
#: ../src/engine/input/key_mapping/SpecifiedInputKey.cs:77
msgid "UNKNOWN_MOUSE"
msgstr "Unknown mouse"

Expand Down
Loading

0 comments on commit c6284ff

Please sign in to comment.