mirror of
https://github.com/zjs81/meshcore-open.git
synced 2026-07-26 13:36:39 +10:00
resolved conflict and update doc
This commit is contained in:
+204
-17
@@ -19,7 +19,18 @@
|
||||
"channels_regionSetTo",
|
||||
"channels_regionNotSet",
|
||||
"channels_regionSelect_Title",
|
||||
"channels_clearRegion"
|
||||
"channels_clearRegion",
|
||||
"chat_receivedGif",
|
||||
"repeater_keySettings",
|
||||
"repeater_keySettingsSubtitle",
|
||||
"repeater_prvKey",
|
||||
"repeater_prvKeyHelper",
|
||||
"repeater_generatePrvKey",
|
||||
"repeater_stopGeneratingPrvKey",
|
||||
"repeater_pubKey",
|
||||
"repeater_pubKeyHelper",
|
||||
"repeater_pubKeyPrefix",
|
||||
"repeater_pubKeyPrefixHelper"
|
||||
],
|
||||
|
||||
"de": [
|
||||
@@ -29,7 +40,18 @@
|
||||
"repeater_pathHashModeOption0",
|
||||
"repeater_pathHashModeOption1",
|
||||
"repeater_pathHashModeOption2",
|
||||
"repeater_pathHashModeOption3"
|
||||
"repeater_pathHashModeOption3",
|
||||
"chat_receivedGif",
|
||||
"repeater_keySettings",
|
||||
"repeater_keySettingsSubtitle",
|
||||
"repeater_prvKey",
|
||||
"repeater_prvKeyHelper",
|
||||
"repeater_generatePrvKey",
|
||||
"repeater_stopGeneratingPrvKey",
|
||||
"repeater_pubKey",
|
||||
"repeater_pubKeyHelper",
|
||||
"repeater_pubKeyPrefix",
|
||||
"repeater_pubKeyPrefixHelper"
|
||||
],
|
||||
|
||||
"es": [
|
||||
@@ -52,7 +74,18 @@
|
||||
"channels_regionSetTo",
|
||||
"channels_regionNotSet",
|
||||
"channels_regionSelect_Title",
|
||||
"channels_clearRegion"
|
||||
"channels_clearRegion",
|
||||
"chat_receivedGif",
|
||||
"repeater_keySettings",
|
||||
"repeater_keySettingsSubtitle",
|
||||
"repeater_prvKey",
|
||||
"repeater_prvKeyHelper",
|
||||
"repeater_generatePrvKey",
|
||||
"repeater_stopGeneratingPrvKey",
|
||||
"repeater_pubKey",
|
||||
"repeater_pubKeyHelper",
|
||||
"repeater_pubKeyPrefix",
|
||||
"repeater_pubKeyPrefixHelper"
|
||||
],
|
||||
|
||||
"fr": [
|
||||
@@ -75,7 +108,18 @@
|
||||
"channels_regionSetTo",
|
||||
"channels_regionNotSet",
|
||||
"channels_regionSelect_Title",
|
||||
"channels_clearRegion"
|
||||
"channels_clearRegion",
|
||||
"chat_receivedGif",
|
||||
"repeater_keySettings",
|
||||
"repeater_keySettingsSubtitle",
|
||||
"repeater_prvKey",
|
||||
"repeater_prvKeyHelper",
|
||||
"repeater_generatePrvKey",
|
||||
"repeater_stopGeneratingPrvKey",
|
||||
"repeater_pubKey",
|
||||
"repeater_pubKeyHelper",
|
||||
"repeater_pubKeyPrefix",
|
||||
"repeater_pubKeyPrefixHelper"
|
||||
],
|
||||
|
||||
"hu": [
|
||||
@@ -98,7 +142,18 @@
|
||||
"channels_regionSetTo",
|
||||
"channels_regionNotSet",
|
||||
"channels_regionSelect_Title",
|
||||
"channels_clearRegion"
|
||||
"channels_clearRegion",
|
||||
"chat_receivedGif",
|
||||
"repeater_keySettings",
|
||||
"repeater_keySettingsSubtitle",
|
||||
"repeater_prvKey",
|
||||
"repeater_prvKeyHelper",
|
||||
"repeater_generatePrvKey",
|
||||
"repeater_stopGeneratingPrvKey",
|
||||
"repeater_pubKey",
|
||||
"repeater_pubKeyHelper",
|
||||
"repeater_pubKeyPrefix",
|
||||
"repeater_pubKeyPrefixHelper"
|
||||
],
|
||||
|
||||
"it": [
|
||||
@@ -121,7 +176,18 @@
|
||||
"channels_regionSetTo",
|
||||
"channels_regionNotSet",
|
||||
"channels_regionSelect_Title",
|
||||
"channels_clearRegion"
|
||||
"channels_clearRegion",
|
||||
"chat_receivedGif",
|
||||
"repeater_keySettings",
|
||||
"repeater_keySettingsSubtitle",
|
||||
"repeater_prvKey",
|
||||
"repeater_prvKeyHelper",
|
||||
"repeater_generatePrvKey",
|
||||
"repeater_stopGeneratingPrvKey",
|
||||
"repeater_pubKey",
|
||||
"repeater_pubKeyHelper",
|
||||
"repeater_pubKeyPrefix",
|
||||
"repeater_pubKeyPrefixHelper"
|
||||
],
|
||||
|
||||
"ja": [
|
||||
@@ -144,7 +210,18 @@
|
||||
"channels_regionSetTo",
|
||||
"channels_regionNotSet",
|
||||
"channels_regionSelect_Title",
|
||||
"channels_clearRegion"
|
||||
"channels_clearRegion",
|
||||
"chat_receivedGif",
|
||||
"repeater_keySettings",
|
||||
"repeater_keySettingsSubtitle",
|
||||
"repeater_prvKey",
|
||||
"repeater_prvKeyHelper",
|
||||
"repeater_generatePrvKey",
|
||||
"repeater_stopGeneratingPrvKey",
|
||||
"repeater_pubKey",
|
||||
"repeater_pubKeyHelper",
|
||||
"repeater_pubKeyPrefix",
|
||||
"repeater_pubKeyPrefixHelper"
|
||||
],
|
||||
|
||||
"ko": [
|
||||
@@ -167,7 +244,18 @@
|
||||
"channels_regionSetTo",
|
||||
"channels_regionNotSet",
|
||||
"channels_regionSelect_Title",
|
||||
"channels_clearRegion"
|
||||
"channels_clearRegion",
|
||||
"chat_receivedGif",
|
||||
"repeater_keySettings",
|
||||
"repeater_keySettingsSubtitle",
|
||||
"repeater_prvKey",
|
||||
"repeater_prvKeyHelper",
|
||||
"repeater_generatePrvKey",
|
||||
"repeater_stopGeneratingPrvKey",
|
||||
"repeater_pubKey",
|
||||
"repeater_pubKeyHelper",
|
||||
"repeater_pubKeyPrefix",
|
||||
"repeater_pubKeyPrefixHelper"
|
||||
],
|
||||
|
||||
"nl": [
|
||||
@@ -190,7 +278,18 @@
|
||||
"channels_regionSetTo",
|
||||
"channels_regionNotSet",
|
||||
"channels_regionSelect_Title",
|
||||
"channels_clearRegion"
|
||||
"channels_clearRegion",
|
||||
"chat_receivedGif",
|
||||
"repeater_keySettings",
|
||||
"repeater_keySettingsSubtitle",
|
||||
"repeater_prvKey",
|
||||
"repeater_prvKeyHelper",
|
||||
"repeater_generatePrvKey",
|
||||
"repeater_stopGeneratingPrvKey",
|
||||
"repeater_pubKey",
|
||||
"repeater_pubKeyHelper",
|
||||
"repeater_pubKeyPrefix",
|
||||
"repeater_pubKeyPrefixHelper"
|
||||
],
|
||||
|
||||
"pl": [
|
||||
@@ -213,7 +312,18 @@
|
||||
"channels_regionSetTo",
|
||||
"channels_regionNotSet",
|
||||
"channels_regionSelect_Title",
|
||||
"channels_clearRegion"
|
||||
"channels_clearRegion",
|
||||
"chat_receivedGif",
|
||||
"repeater_keySettings",
|
||||
"repeater_keySettingsSubtitle",
|
||||
"repeater_prvKey",
|
||||
"repeater_prvKeyHelper",
|
||||
"repeater_generatePrvKey",
|
||||
"repeater_stopGeneratingPrvKey",
|
||||
"repeater_pubKey",
|
||||
"repeater_pubKeyHelper",
|
||||
"repeater_pubKeyPrefix",
|
||||
"repeater_pubKeyPrefixHelper"
|
||||
],
|
||||
|
||||
"pt": [
|
||||
@@ -236,7 +346,18 @@
|
||||
"channels_regionSetTo",
|
||||
"channels_regionNotSet",
|
||||
"channels_regionSelect_Title",
|
||||
"channels_clearRegion"
|
||||
"channels_clearRegion",
|
||||
"chat_receivedGif",
|
||||
"repeater_keySettings",
|
||||
"repeater_keySettingsSubtitle",
|
||||
"repeater_prvKey",
|
||||
"repeater_prvKeyHelper",
|
||||
"repeater_generatePrvKey",
|
||||
"repeater_stopGeneratingPrvKey",
|
||||
"repeater_pubKey",
|
||||
"repeater_pubKeyHelper",
|
||||
"repeater_pubKeyPrefix",
|
||||
"repeater_pubKeyPrefixHelper"
|
||||
],
|
||||
|
||||
"ru": [
|
||||
@@ -259,7 +380,18 @@
|
||||
"channels_regionSetTo",
|
||||
"channels_regionNotSet",
|
||||
"channels_regionSelect_Title",
|
||||
"channels_clearRegion"
|
||||
"channels_clearRegion",
|
||||
"chat_receivedGif",
|
||||
"repeater_keySettings",
|
||||
"repeater_keySettingsSubtitle",
|
||||
"repeater_prvKey",
|
||||
"repeater_prvKeyHelper",
|
||||
"repeater_generatePrvKey",
|
||||
"repeater_stopGeneratingPrvKey",
|
||||
"repeater_pubKey",
|
||||
"repeater_pubKeyHelper",
|
||||
"repeater_pubKeyPrefix",
|
||||
"repeater_pubKeyPrefixHelper"
|
||||
],
|
||||
|
||||
"sk": [
|
||||
@@ -282,7 +414,18 @@
|
||||
"channels_regionSetTo",
|
||||
"channels_regionNotSet",
|
||||
"channels_regionSelect_Title",
|
||||
"channels_clearRegion"
|
||||
"channels_clearRegion",
|
||||
"chat_receivedGif",
|
||||
"repeater_keySettings",
|
||||
"repeater_keySettingsSubtitle",
|
||||
"repeater_prvKey",
|
||||
"repeater_prvKeyHelper",
|
||||
"repeater_generatePrvKey",
|
||||
"repeater_stopGeneratingPrvKey",
|
||||
"repeater_pubKey",
|
||||
"repeater_pubKeyHelper",
|
||||
"repeater_pubKeyPrefix",
|
||||
"repeater_pubKeyPrefixHelper"
|
||||
],
|
||||
|
||||
"sl": [
|
||||
@@ -305,7 +448,18 @@
|
||||
"channels_regionSetTo",
|
||||
"channels_regionNotSet",
|
||||
"channels_regionSelect_Title",
|
||||
"channels_clearRegion"
|
||||
"channels_clearRegion",
|
||||
"chat_receivedGif",
|
||||
"repeater_keySettings",
|
||||
"repeater_keySettingsSubtitle",
|
||||
"repeater_prvKey",
|
||||
"repeater_prvKeyHelper",
|
||||
"repeater_generatePrvKey",
|
||||
"repeater_stopGeneratingPrvKey",
|
||||
"repeater_pubKey",
|
||||
"repeater_pubKeyHelper",
|
||||
"repeater_pubKeyPrefix",
|
||||
"repeater_pubKeyPrefixHelper"
|
||||
],
|
||||
|
||||
"sv": [
|
||||
@@ -328,7 +482,18 @@
|
||||
"channels_regionSetTo",
|
||||
"channels_regionNotSet",
|
||||
"channels_regionSelect_Title",
|
||||
"channels_clearRegion"
|
||||
"channels_clearRegion",
|
||||
"chat_receivedGif",
|
||||
"repeater_keySettings",
|
||||
"repeater_keySettingsSubtitle",
|
||||
"repeater_prvKey",
|
||||
"repeater_prvKeyHelper",
|
||||
"repeater_generatePrvKey",
|
||||
"repeater_stopGeneratingPrvKey",
|
||||
"repeater_pubKey",
|
||||
"repeater_pubKeyHelper",
|
||||
"repeater_pubKeyPrefix",
|
||||
"repeater_pubKeyPrefixHelper"
|
||||
],
|
||||
|
||||
"uk": [
|
||||
@@ -351,7 +516,18 @@
|
||||
"channels_regionSetTo",
|
||||
"channels_regionNotSet",
|
||||
"channels_regionSelect_Title",
|
||||
"channels_clearRegion"
|
||||
"channels_clearRegion",
|
||||
"chat_receivedGif",
|
||||
"repeater_keySettings",
|
||||
"repeater_keySettingsSubtitle",
|
||||
"repeater_prvKey",
|
||||
"repeater_prvKeyHelper",
|
||||
"repeater_generatePrvKey",
|
||||
"repeater_stopGeneratingPrvKey",
|
||||
"repeater_pubKey",
|
||||
"repeater_pubKeyHelper",
|
||||
"repeater_pubKeyPrefix",
|
||||
"repeater_pubKeyPrefixHelper"
|
||||
],
|
||||
|
||||
"zh": [
|
||||
@@ -374,6 +550,17 @@
|
||||
"channels_regionSetTo",
|
||||
"channels_regionNotSet",
|
||||
"channels_regionSelect_Title",
|
||||
"channels_clearRegion"
|
||||
"channels_clearRegion",
|
||||
"chat_receivedGif",
|
||||
"repeater_keySettings",
|
||||
"repeater_keySettingsSubtitle",
|
||||
"repeater_prvKey",
|
||||
"repeater_prvKeyHelper",
|
||||
"repeater_generatePrvKey",
|
||||
"repeater_stopGeneratingPrvKey",
|
||||
"repeater_pubKey",
|
||||
"repeater_pubKeyHelper",
|
||||
"repeater_pubKeyPrefix",
|
||||
"repeater_pubKeyPrefixHelper"
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user