Skip to content

Commit 3d08cfa

Browse files
KaliStudioKaliStudio
committed
Conversion des fichiers en UTF-8 et modifications des caractères accentués
1 parent 42a62b8 commit 3d08cfa

File tree

239 files changed

+552
-513
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

239 files changed

+552
-513
lines changed

‎applications/debug/accessor/scene/accessor_scene_start.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ void AccessorSceneStart::on_enter(AccessorApp* app) {
88
AccessorAppViewManager* view_manager = app->get_view_manager();
99
Popup* popup = view_manager->get_popup();
1010

11-
popup_set_header(popup, "App acc""\xE8""s", 64, 16, AlignCenter, AlignBottom);
11+
popup_set_header(popup, "App accès", 64, 16, AlignCenter, AlignBottom);
1212
app->set_text_store("[??????]");
1313
popup_set_text(popup, app->get_text_store(), 64, 22, AlignCenter, AlignTop);
1414

‎applications/debug/battery_test_app/views/battery_info.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ static void draw_battery(Canvas* canvas, BatteryInfoModel* data, int x, int y) {
4444

4545
// Set text
4646
if(charge_current > 0) {
47-
snprintf(emote, sizeof(emote), "%s", "D""\xE9""licieux!");
48-
snprintf(header, sizeof(header), "%s", "Chargement ""\xE0");
47+
snprintf(emote, sizeof(emote), "%s", "Délicieux!");
48+
snprintf(header, sizeof(header), "%s", "Chargement à);
4949
snprintf(
5050
value,
5151
sizeof(value),
@@ -70,16 +70,16 @@ static void draw_battery(Canvas* canvas, BatteryInfoModel* data, int x, int y) {
7070
snprintf(header, 20, "...");
7171
} else if(data->charging_voltage < 4.2) {
7272
// Non-default battery charging limit, mention it
73-
snprintf(emote, sizeof(emote), "Charg""\xE9""!");
74-
snprintf(header, sizeof(header), "Limit""\xE9"" ""\xE0");
73+
snprintf(emote, sizeof(emote), "Chargé!");
74+
snprintf(header, sizeof(header), "Limité à);
7575
snprintf(
7676
value,
7777
sizeof(value),
7878
"%lu.%luV",
7979
(uint32_t)(data->charging_voltage),
8080
(uint32_t)(data->charging_voltage * 10) % 10);
8181
} else {
82-
snprintf(header, sizeof(header), "Charg""\xE9""!");
82+
snprintf(header, sizeof(header), "Chargé!");
8383
}
8484

8585
canvas_draw_str_aligned(canvas, 92, y + 3, AlignCenter, AlignCenter, emote);

‎applications/debug/unit_tests/furi/furi_string_test.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ MU_TEST(mu_test_furi_string_trim) {
417417
}
418418

419419
MU_TEST(mu_test_furi_string_utf8) {
420-
FuriString* utf8_string = furi_string_alloc_set("イルカ");
420+
FuriString* utf8_string = furi_string_alloc_set("イルカ");
421421

422422
// test furi_string_utf8_length
423423
mu_assert_int_eq(9, furi_string_size(utf8_string));
@@ -440,7 +440,7 @@ MU_TEST(mu_test_furi_string_utf8) {
440440
// test furi_string_utf8_push
441441
furi_string_set(utf8_string, "");
442442
furi_string_utf8_push(utf8_string, value);
443-
mu_assert_string_eq("🐬", furi_string_get_cstr(utf8_string));
443+
mu_assert_string_eq("🐬", furi_string_get_cstr(utf8_string));
444444

445445
furi_string_free(utf8_string);
446446
}

‎applications/drivers/subghz/cc1101_ext/cc1101_ext.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ void subghz_device_cc1101_ext_load_custom_preset(const uint8_t* preset_data) {
332332
//show debug
333333
if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) {
334334
i = 0;
335-
FURI_LOG_D(TAG, "Chargement d'un préréglage personnalisé");
335+
FURI_LOG_D(TAG, "Chargement d'un préréglage personnalisé");
336336
while(preset_data[i]) {
337337
FURI_LOG_D(TAG, "Reg[%lu]: %02X=%02X", i, preset_data[i], preset_data[i + 1]);
338338
i += 2;
@@ -511,13 +511,13 @@ bool subghz_device_cc1101_ext_is_tx_allowed(uint32_t value) {
511511
!(value >= 299999755 && value <= 350000335) && // was increased from 348 to 350
512512
!(value >= 386999938 && value <= 467750000) && // was increased from 464 to 467.75
513513
!(value >= 778999847 && value <= 928000000)) {
514-
FURI_LOG_I(TAG, "Fréquence bloquée - en dehors de la plage par défaut");
514+
FURI_LOG_I(TAG, "Fréquence bloquée - en dehors de la plage par défaut");
515515
return false;
516516
} else if(
517517
(SUBGHZ_DEVICE_CC1101_EXT_FORCE_EXTENDED_RANGE ||
518518
subghz_device_cc1101_ext->extended_range) &&
519519
!subghz_device_cc1101_ext_is_frequency_valid(value)) {
520-
FURI_LOG_I(TAG, "Fréquence bloquée - en dehors de la plage étendue");
520+
FURI_LOG_I(TAG, "Fréquence bloquée - en dehors de la plage étendue");
521521
return false;
522522
}
523523

‎applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
static bool subghz_device_cc1101_ext_interconnect_is_frequency_valid(uint32_t frequency) {
88
bool ret = subghz_device_cc1101_ext_is_frequency_valid(frequency);
99
if(!ret) {
10-
furi_crash("SubGhz: fr""\xE9""quence incorrecte.");
10+
furi_crash("SubGhz: fréquence incorrecte.");
1111
}
1212
return ret;
1313
}

‎applications/external/avr_isp/lib/driver/avr_isp_prog.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ static void avr_isp_prog_set_cfg(AvrIspProg* instance) {
196196
instance->cfg->lockbytes = instance->buff[6];
197197
instance->cfg->fusebytes = instance->buff[7];
198198
instance->cfg->flashpoll = instance->buff[8];
199-
// ignore (instance->buff[9] == instance->buff[8]) //FLASH polling value. Same as “flashpoll”
199+
// ignore (instance->buff[9] == instance->buff[8]) //FLASH polling value. Same as “flashpoll”
200200
instance->cfg->eeprompoll = instance->buff[10] << 8 | instance->buff[11];
201201
instance->cfg->pagesize = instance->buff[12] << 8 | instance->buff[13];
202202
instance->cfg->eepromsize = instance->buff[14] << 8 | instance->buff[15];

‎applications/external/ble_spam/ble_spam.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
static Attack attacks[] = {
1717
{
18-
.title = "La panoplie compl""\xE8""te",
19-
.text = "Attaques simultan""\xE9""es",
18+
.title = "La panoplie complète",
19+
.text = "Attaques simultanées",
2020
.protocol = NULL,
2121
.payload =
2222
{
@@ -26,7 +26,7 @@ static Attack attacks[] = {
2626
},
2727
{
2828
.title = "iOS 17 Chaos",
29-
.text = "iPhones r""\xE9""cents, long",
29+
.text = "iPhones récents, long",
3030
.protocol = &protocol_continuity,
3131
.payload =
3232
{
@@ -100,7 +100,7 @@ static Attack attacks[] = {
100100
},
101101
},
102102
{
103-
.title = "P""\xE9""riph""\xE9""rique Windows trouv""\xE9",
103+
.title = "Périphérique Windows trouvé",
104104
.text = "Aucune attente, court",
105105
.protocol = &protocol_swiftpair,
106106
.payload =
@@ -286,9 +286,9 @@ static void draw_callback(Canvas* canvas, void* _ctx) {
286286
48,
287287
AlignLeft,
288288
AlignTop,
289-
"\e#Des apps\e# interf""\xE8""rent\n"
289+
"\e#Des apps\e# interfèrent\n"
290290
"avec les attaques, conseil:\n"
291-
"reste ""\xE0"" l'""\xE9""cran d'accueil",
291+
"reste à l'écran d'accueil",
292292
false);
293293
break;
294294
case PageHelpDelay:
@@ -302,8 +302,8 @@ static void draw_callback(Canvas* canvas, void* _ctx) {
302302
48,
303303
AlignLeft,
304304
AlignTop,
305-
"\e#D""\xE9""lai\e# temps entre les\n"
306-
"tentatives (haut ""\xE0"" droite),\n"
305+
"\e#Délai\e# temps entre les\n"
306+
"tentatives (haut à droite),\n"
307307
"conseil 20ms.",
308308
false);
309309
break;

‎applications/external/ble_spam/protocols/continuity.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ static const ContinuityColor colors_beats_solo_3[] = {
3434
{0x09, "Noir"},
3535
{0xE, "Violet/Blanc"},
3636
{0xF, "Rouge vif"},
37-
{0x12, "Rouge fonc""\xE9"},
37+
{0x12, "Rouge foncé"},
3838
{0x13, "Vert marais"},
39-
{0x14, "Gris fonc""\xE9"},
40-
{0x15, "Bleu fonc""\xE9"},
39+
{0x14, "Gris foncé"},
40+
{0x15, "Bleu foncé"},
4141
{0x1D, "Or rose 2"},
4242
{0x20, "Bleu/Vert"},
4343
{0x21, "Violet/Orange"},
@@ -101,13 +101,13 @@ static const ContinuityColor colors_beats_studio_3[] = {
101101
{0x02, "Rouge"},
102102
{0x03, "Bleu"},
103103
{0x18, "Gris Ombre"},
104-
{0x19, "Sable du D""\xE9""sert"},
104+
{0x19, "Sable du Désert"},
105105
{0x25, "Noir/Rouge"},
106106
{0x26, "Noir Minuit"},
107-
{0x27, "Sable du D""\xE9""sert 2"},
107+
{0x27, "Sable du Désert 2"},
108108
{0x28, "Gris"},
109109
{0x29, "Bleu clair / Or"},
110-
{0x42, "Camo For""\xEA""t Verte"},
110+
{0x42, "Camo Forêt Verte"},
111111
{0x43, "Camo Blanc"},
112112
};
113113
static const ContinuityColor colors_beats_studio_pro[] = {
@@ -120,11 +120,11 @@ static const ContinuityColor colors_beats_fit_pro[] = {
120120
{0x02, "Rose"},
121121
{0x03, "Gris/Blanc"},
122122
{0x04, "Rose Intégral"},
123-
{0x05, "Vert N""\xE9""on"},
123+
{0x05, "Vert Néon"},
124124
{0x06, "Bleu Nuit"},
125125
{0x07, "Rose Clair"},
126126
{0x08, "Marron"},
127-
{0x09, "Marron Fonc""\xE9"},
127+
{0x09, "Marron Foncé"},
128128
};
129129
static const ContinuityColor colors_beats_studio_buds_[] = {
130130
{0x00, "Noir"},
@@ -182,8 +182,8 @@ static const struct {
182182
{0x19, "Synchro audio AppleTV"},
183183
{0x1E, "Balance couleurs AppleTV"},
184184
{0x09, "Config du nouvel iPhone"},
185-
{0x2F, "Connexion ""\xE0"" un autre appareil"},
186-
{0x02, "Transfert de num""\xE9""ro de tel"},
185+
{0x2F, "Connexion à un autre appareil"},
186+
{0x02, "Transfert de numéro de tel"},
187187
{0x0B, "Config HomePod"},
188188
{0x01, "Config nouvelle AppleTV"},
189189
{0x06, "Associer AppleTV"},
@@ -199,8 +199,8 @@ static const char* type_names[ContinuityTypeCOUNT] = {
199199
[ContinuityTypeHandoff] = "Handoff",
200200
[ContinuityTypeTetheringSource] = "Source de connexion",
201201
[ContinuityTypeNearbyAction] = "Action Continue",
202-
[ContinuityTypeNearbyInfo] = "Info de proximit""\xE9",
203-
[ContinuityTypeCustomCrash] = "Continuit""\xE9"" perso",
202+
[ContinuityTypeNearbyInfo] = "Info de proximité",
203+
[ContinuityTypeCustomCrash] = "Continuité perso",
204204
};
205205
static const char* get_name(const Payload* payload) {
206206
const ContinuityCfg* cfg = &payload->cfg.continuity;
@@ -777,8 +777,8 @@ static void extra_config(Ctx* ctx) {
777777
break;
778778
}
779779
case ContinuityTypeCustomCrash: {
780-
variable_item_list_add(list, "CRASH IOS 17.2 CORRIG""\xC9""", 0, NULL, NULL);
781-
variable_item_list_add(list, "Lock+unlock aide ""\xE0"" crash", 0, NULL, NULL);
780+
variable_item_list_add(list, "CRASH IOS 17.2 CORRIGÉ", 0, NULL, NULL);
781+
variable_item_list_add(list, "Lock+unlock aide à crash", 0, NULL, NULL);
782782
variable_item_list_add(list, "Pour iPhone 12 et plus", 0, NULL, NULL);
783783
break;
784784
}
@@ -905,7 +905,7 @@ void scene_continuity_pp_model_custom_on_enter(void* _ctx) {
905905
ContinuityCfg* cfg = &payload->cfg.continuity;
906906
ByteInput* byte_input = ctx->byte_input;
907907

908-
byte_input_set_header_text(byte_input, "Entrez le mod""\xE8""le code perso");
908+
byte_input_set_header_text(byte_input, "Entrez le modèle code perso");
909909

910910
ctx->byte_store[0] = (cfg->data.proximity_pair.model >> 0x08) & 0xFF;
911911
ctx->byte_store[1] = (cfg->data.proximity_pair.model >> 0x00) & 0xFF;
@@ -1223,7 +1223,7 @@ void scene_continuity_na_action_custom_on_enter(void* _ctx) {
12231223
ContinuityCfg* cfg = &payload->cfg.continuity;
12241224
ByteInput* byte_input = ctx->byte_input;
12251225

1226-
byte_input_set_header_text(byte_input, "Entrez une action personnalis""\xE9");
1226+
byte_input_set_header_text(byte_input, "Entrez une action personnalisé");
12271227

12281228
ctx->byte_store[0] = (cfg->data.nearby_action.action >> 0x00) & 0xFF;
12291229

‎applications/external/ble_spam/protocols/easysetup.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@ static const struct {
1111
{0xEE7A0C, "Ecouteurs alternatifs"},
1212
{0x9D1700, "Points alternatifs"},
1313
{0x39EA48, "Buds2 violet clair"},
14-
{0xA7C62C, "Buds2 argent bleu""\xE2""tre"},
14+
{0xA7C62C, "Buds2 argent bleuâtre"},
1515
{0x850116, "Buds Live noirs"},
1616
{0x3D8F41, "Buds2 gris et noirs"},
17-
{0x3B6D02, "Buds2 chrome bleu""\xE2""tre"},
17+
{0x3B6D02, "Buds2 chrome bleuâtre"},
1818
{0xAE063C, "Buds2 beige gris"},
1919
{0xB8B905, "Buds blancs purs"},
2020
{0xEAAA17, "Buds2 blancs purs"},
2121
{0xD30704, "Buds noirs"},
22-
{0x9DB006, "Buds drapeau fran""\xE7""ais"},
23-
{0x101F1A, "Buds Live violet fonc""\xE9"},
24-
{0x859608, "Buds bleus fonc""\xE9""s"},
22+
{0x9DB006, "Buds drapeau français"},
23+
{0x101F1A, "Buds Live violet foncé"},
24+
{0x859608, "Buds bleus foncés"},
2525
{0x8E4503, "Buds roses"},
2626
{0x2C6740, "Buds2 blancs et noirs"},
2727
{0x3F6718, "Buds Live bronze"},
2828
{0x42C519, "Buds Live rouges"},
2929
{0xAE073A, "Buds2 noirs et blancs"},
30-
{0x011716, "Buds2 noirs ""\xE9""l""\xE9""gants"},
30+
{0x011716, "Buds2 noirs élégants"},
3131
};
3232
static const uint8_t buds_models_count = COUNT_OF(buds_models);
3333

@@ -69,7 +69,7 @@ static const struct {
6969
static const uint8_t watch_models_count = COUNT_OF(watch_models);
7070

7171
static const char* type_names[EasysetupTypeCOUNT] = {
72-
[EasysetupTypeBuds] = "EasySetup ""\xC9""couteurs",
72+
[EasysetupTypeBuds] = "EasySetup Écouteurs",
7373
[EasysetupTypeWatch] = "EasySetup Montre",
7474
};
7575
static const char* get_name(const Payload* payload) {
@@ -274,7 +274,7 @@ static void extra_config(Ctx* ctx) {
274274
switch(cfg->type) {
275275
case EasysetupTypeBuds: {
276276
item = variable_item_list_add(
277-
list, "Code mod""\xE8""le", buds_models_count + 1, buds_model_changed, payload);
277+
list, "Code modèle", buds_models_count + 1, buds_model_changed, payload);
278278
const char* model_name = NULL;
279279
char model_name_buf[9];
280280
switch(payload->mode) {
@@ -559,7 +559,7 @@ void scene_easysetup_watch_model_custom_on_enter(void* _ctx) {
559559
EasysetupCfg* cfg = &payload->cfg.easysetup;
560560
ByteInput* byte_input = ctx->byte_input;
561561

562-
byte_input_set_header_text(byte_input, "Entrez code mod""\xE8""le perso");
562+
byte_input_set_header_text(byte_input, "Entrez code modèle perso");
563563

564564
ctx->byte_store[0] = (cfg->data.watch.model >> 0x00) & 0xFF;
565565

‎applications/external/ble_spam/protocols/fastpair.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ static void extra_config(Ctx* ctx) {
660660
uint8_t value_index;
661661
uint16_t model_index;
662662

663-
item = variable_item_list_add(list, "Code mod""\xE8""le", 3, model_changed, payload);
663+
item = variable_item_list_add(list, "Code modèle", 3, model_changed, payload);
664664
const char* model_name = NULL;
665665
char model_name_buf[9];
666666
switch(payload->mode) {

0 commit comments

Comments
 (0)