From 15041873c2cbdf987098f1c8f61cd2f5bed805ac Mon Sep 17 00:00:00 2001 From: blittan Date: Tue, 8 Jan 2019 22:12:09 +0100 Subject: [PATCH 1/2] Clearer meaning of Static or DHCP --- sonoff/my_user_config.h | 2 +- sonoff/user_config_override_sample.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sonoff/my_user_config.h b/sonoff/my_user_config.h index 4f7c97dc8..dd06af48d 100644 --- a/sonoff/my_user_config.h +++ b/sonoff/my_user_config.h @@ -56,7 +56,7 @@ #define SAVE_STATE 1 // [SetOption0] Save changed power state to Flash (0 = disable, 1 = enable) // -- Wifi ---------------------------------------- -#define WIFI_IP_ADDRESS "0.0.0.0" // [IpAddress1] Set to 0.0.0.0 for using DHCP or IP address +#define WIFI_IP_ADDRESS "0.0.0.0" // [IpAddress1] Set to 0.0.0.0 for using DHCP or enter a static IP address #define WIFI_GATEWAY "192.168.1.1" // [IpAddress2] If not using DHCP set Gateway IP address #define WIFI_SUBNETMASK "255.255.255.0" // [IpAddress3] If not using DHCP set Network mask #define WIFI_DNS "192.168.1.1" // [IpAddress4] If not using DHCP set DNS IP address (might be equal to WIFI_GATEWAY) diff --git a/sonoff/user_config_override_sample.h b/sonoff/user_config_override_sample.h index 678ad922e..b2b403e1a 100644 --- a/sonoff/user_config_override_sample.h +++ b/sonoff/user_config_override_sample.h @@ -74,7 +74,7 @@ Examples : #ifdef MY_IP #undef WIFI_IP_ADDRESS -#define WIFI_IP_ADDRESS MY_IP // Set to 0.0.0.0 for using DHCP or IP address +#define WIFI_IP_ADDRESS MY_IP // Set to 0.0.0.0 for using DHCP or enter a static IP address #endif #ifdef MY_GW From faa3e9a741ff58a63f5eabc4c2bcc0cd0e8c1cb0 Mon Sep 17 00:00:00 2001 From: blittan Date: Tue, 8 Jan 2019 23:05:54 +0100 Subject: [PATCH 2/2] Updated Swedish translation --- sonoff/language/sv-SE.h | 54 ++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/sonoff/language/sv-SE.h b/sonoff/language/sv-SE.h index c36440ac7..21246a8f3 100644 --- a/sonoff/language/sv-SE.h +++ b/sonoff/language/sv-SE.h @@ -132,11 +132,11 @@ #define D_PROGRAM_FLASH_SIZE "Program-flashstorlek" #define D_PROGRAM_SIZE "Programstorlek" #define D_PROJECT "Projekt" -#define D_RAIN "Rain" +#define D_RAIN "Regn" #define D_RECEIVED "Mottagen" #define D_RESTART "Omstart" #define D_RESTARTING "Startar om" -#define D_RESTART_REASON "Restart Reason" +#define D_RESTART_REASON "Omstartsorsak" #define D_RESTORE "återställ" #define D_RETAINED "bevarad" #define D_RULE "Regel" @@ -168,13 +168,13 @@ #define D_UV_INDEX_2 "Med" #define D_UV_INDEX_3 "Hög" #define D_UV_INDEX_4 "Farligt" -#define D_UV_INDEX_5 "BurnL1/2" -#define D_UV_INDEX_6 "BurnL3" -#define D_UV_INDEX_7 "OoR" // Out of Range +#define D_UV_INDEX_5 "Skadligt" +#define D_UV_INDEX_6 "Extremt" +#define D_UV_INDEX_7 "UO" // Out of Range #define D_UV_LEVEL "UV nivå" #define D_UV_POWER "UV kraft" #define D_VERSION "Version" -#define D_VOLTAGE "Voltage" +#define D_VOLTAGE "Volttal" #define D_WEIGHT "Vikt" #define D_WARMLIGHT "Varm" #define D_WEB_SERVER "Webbserver" @@ -197,7 +197,7 @@ #define D_WPS_FAILED_WITH_STATUS "WPS-konfigurering MISSLYCKADES med status" #define D_ACTIVE_FOR_3_MINUTES "aktiv för 3 minuter" #define D_FAILED_TO_START "misslyckades att starta" -#define D_PATCH_ISSUE_2186 "Patch issue 2186" +#define D_PATCH_ISSUE_2186 "Laga problem 2186" #define D_CONNECTING_TO_AP "Ansluter till AP" #define D_IN_MODE "i läge" #define D_CONNECT_FAILED_NO_IP_ADDRESS "Anslutning misslyckades mottog ingen IP-adress" @@ -253,7 +253,7 @@ #define D_MODULE_PARAMETERS "Modulparameterar" #define D_MODULE_TYPE "Modultyp" -#define D_PULLUP_ENABLE "No Button/Switch pull-up" +#define D_PULLUP_ENABLE "Ingen knapp/brytare pull-up" #define D_GPIO "GPIO" #define D_SERIAL_IN "Seriell in" #define D_SERIAL_OUT "Seriell ut" @@ -281,7 +281,7 @@ #define D_LOGGING_PARAMETERS "Loggningsparametrar" #define D_SERIAL_LOG_LEVEL "Seriell loggnivå" #define D_WEB_LOG_LEVEL "Webb loggnivå" -#define D_SYS_LOG_LEVEL "Syslog-nivp" +#define D_SYS_LOG_LEVEL "Syslog-nivå" #define D_MORE_DEBUG "Mer debugging" #define D_SYSLOG_HOST "Syslog-värd" #define D_SYSLOG_PORT "Syslog-port" @@ -301,8 +301,8 @@ #define D_CONFIGURATION_RESET "Konfiguration nollställd" #define D_PROGRAM_VERSION "Programversion" -#define D_BUILD_DATE_AND_TIME "Build datum & tid" -#define D_CORE_AND_SDK_VERSION "Core/SDK Version" +#define D_BUILD_DATE_AND_TIME "Kompilerings datum & tid" +#define D_CORE_AND_SDK_VERSION "Core/SDK version" #define D_FLASH_WRITE_COUNT "Flash-skrivningsräknare" #define D_MAC_ADDRESS "MAC-adress" #define D_MQTT_HOST "MQTT-värd" @@ -339,11 +339,11 @@ #define D_UPLOAD_ERR_11 "Misslyckades rensa RF chip" #define D_UPLOAD_ERR_12 "Misslyckades skriva till RF chip" #define D_UPLOAD_ERR_13 "Misslyckades avkoda RF firmware" -#define D_UPLOAD_ERROR_CODE "Upladdningsfelkod" +#define D_UPLOAD_ERROR_CODE "Uppladdningsfelkod" #define D_ENTER_COMMAND "Ange kommando" -#define D_ENABLE_WEBLOG_FOR_RESPONSE "Aktivera weblog 2 om svar förväntas" -#define D_NEED_USER_AND_PASSWORD "Behöver användarnamn=&lösenord=" +#define D_ENABLE_WEBLOG_FOR_RESPONSE "Aktivera webblogg 2 om svar förväntas" +#define D_NEED_USER_AND_PASSWORD "Behöver user=&password=" // xdrv_01_mqtt.ino #define D_FINGERPRINT "Verifierar TLS fingeravtryck..." @@ -392,14 +392,14 @@ // xdrv_09_timers.ino #define D_CONFIGURE_TIMER "Konfigurera timer" -#define D_TIMER_PARAMETERS "timerparametrar" +#define D_TIMER_PARAMETERS "Timerparametrar" #define D_TIMER_ENABLE "Aktivera timer" #define D_TIMER_ARM "Aktivera" #define D_TIMER_TIME "Tid" #define D_TIMER_DAYS "Dagar" #define D_TIMER_REPEAT "Repetera" -#define D_TIMER_OUTPUT "Output" -#define D_TIMER_ACTION "Action" +#define D_TIMER_OUTPUT "Utgång" +#define D_TIMER_ACTION "Åtgärd" // xdrv_10_knx.ino #define D_CONFIGURE_KNX "Konfigurera KNX" @@ -477,9 +477,9 @@ #define D_TX20_WIND_SPEED_AVG "Vindstyrka medel" #define D_TX20_WIND_SPEED_MAX "Vindstyrka max" #define D_TX20_NORTH "N" -#define D_TX20_EAST "E" +#define D_TX20_EAST "Ö" #define D_TX20_SOUTH "S" -#define D_TX20_WEST "W" +#define D_TX20_WEST "V" // sonoff_template.h #define D_SENSOR_NONE "Ingen" @@ -549,8 +549,8 @@ #define D_UNIT_AMPERE "A" #define D_UNIT_CENTIMETER "cm" #define D_UNIT_HERTZ "Hz" -#define D_UNIT_HOUR "Hr" -#define D_UNIT_INCREMENTS "inc" +#define D_UNIT_HOUR "Tim" +#define D_UNIT_INCREMENTS "ink" #define D_UNIT_KILOGRAM "kg" #define D_UNIT_KILOMETER_PER_HOUR "km/h" // or "km/h" #define D_UNIT_KILOOHM "kOhm" @@ -603,12 +603,12 @@ #define D_LOG_WIFI "WIF: " // Wifi //SDM220 -#define D_PHASE_ANGLE "Phase Angle" -#define D_IMPORT_ACTIVE "Import Active" -#define D_EXPORT_ACTIVE "Export Active" -#define D_IMPORT_REACTIVE "Import Reactive" -#define D_EXPORT_REACTIVE "Export Reactive" -#define D_TOTAL_REACTIVE "Total Reactive" +#define D_PHASE_ANGLE "Fasvinkel" +#define D_IMPORT_ACTIVE "Import aktiv" +#define D_EXPORT_ACTIVE "Export aktiv" +#define D_IMPORT_REACTIVE "Import reaktiv" +#define D_EXPORT_REACTIVE "Export reaktiv" +#define D_TOTAL_REACTIVE "Total reaktiv" #define D_UNIT_KWARH "kVArh" #define D_UNIT_ANGLE "Deg"