Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin-aberenguel/#2286_chat_improvemen…
Browse files Browse the repository at this point in the history
…ts' into master-fixes
  • Loading branch information
aberenguel committed Oct 14, 2024
2 parents 2165c84 + 018f83c commit e76af10
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 8 deletions.
4 changes: 2 additions & 2 deletions iped-app/resources/config/conf/CategoriesConfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@
]},
{"name": "SMS Messages", "mimes": ["application/x-ufed-html-sms", "application/x-ufed-sms", "application/x-ios-sms-db"]},
{"name": "MMS Messages", "mimes": ["application/x-ufed-html-mms", "application/x-ufed-mms"]},
{"name": "Messages", "categories":[
{"name": "Instant Messages", "mimes": ["message/x-chat-message", "message/x-threema-message", "application/x-ufed-instantmessage", "message/x-whatsapp-message", "message/x-skype-message", "message/x-skype-filetransfer", "message/x-telegram-message", "message/x-discord-message"]},
{"name": "Instant Messages", "categories":[
{"name": "Messages", "mimes": ["message/x-chat-message", "message/x-threema-message", "application/x-ufed-instantmessage", "message/x-whatsapp-message", "message/x-skype-message", "message/x-skype-filetransfer", "message/x-telegram-message", "message/x-discord-message"]},
{"name": "Chat Activities", "mimes": ["application/x-ufed-chatactivity"]},
{"name": "Message Attachments"},
{"name": "Shared Contacts"},
Expand Down
6 changes: 5 additions & 1 deletion iped-app/resources/localization/iped-categories.properties
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ WhatsApp\ Calls=WhatsApp\ Calls
SMS\ Messages=SMS\ Messages
MMS\ Messages=MMS\ Messages
Instant\ Messages=Instant\ Messages
Messages=Messages
Chat\ Activities=Chat\ Activities
Message\ Attachments=Message\ Attachments
Shared\ Contacts=Shared\ Contacts
Shared\ Locations=Shared\ Locations
Bluetooth\ Devices=Bluetooth\ Devices
SIM\ Data=SIM\ Data
Calendar=Calendar
Expand Down Expand Up @@ -155,7 +160,6 @@ Social\ Connectivity\ Program\ Executables=Social\ Connectivity\ Program\ Execut
Social\ Connectivity\ Program\ Files=Social\ Connectivity\ Program\ Files
GRRF\ Files=GRRF\ Files
Activities\ Sensor=Activities\ Sensor
Chat\ Activities=Chat\ Activities
Credit\ Cards=Credit\ Cards
Device\ Connectivity=Device\ Connectivity
Device\ Events=Device\ Events
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ WhatsApp\ Calls=WhatsApp\ Calls[TBT]
SMS\ Messages=SMS\ Nachrichten
MMS\ Messages=MMS\ Nachrichten
Instant\ Messages=Sofortnachrichten
Messages=Nachrichten
Chat\ Activities=Chat-Aktivitäten
Message\ Attachments=Message\ Attachments[TBT]
Shared\ Contacts=Shared\ Contacts[TBT]
Shared\ Locations=Shared\ Locations[TBT]
Bluetooth\ Devices=Bluetooth\ Geräte
SIM\ Data=SIM\ Daten
Calendar=Kalender
Expand Down Expand Up @@ -155,7 +160,6 @@ Social\ Connectivity\ Program\ Executables=Social Connectivity-Anwendungen
Social\ Connectivity\ Program\ Files=Social Connectivity-Programmdateien
GRRF\ Files=GRRF\ Dateien
Activities\ Sensor=Aktivitätssensor
Chat\ Activities=Chat-Aktivitäten
Credit\ Cards=Kreditkarten
Device\ Connectivity=Geräteverbindungen
Device\ Events=Geräteereignisse
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ WhatsApp\ Calls=WhatsApp\ Calls[TBT]
SMS\ Messages=Mensajes\ SMS
MMS\ Messages=Mensajes\ MMS
Instant\ Messages=Mensajes\ Instantáneos
Messages=Mensajes
Chat\ Activities=Chat\ Actividades
Message\ Attachments=Message\ Attachments[TBT]
Shared\ Contacts=Shared\ Contacts[TBT]
Shared\ Locations=Shared\ Locations[TBT]
Bluetooth\ Devices=Dispositivos\ Bluetooth
SIM\ Data=Datos\ SIM
Calendar=Calendario
Expand Down Expand Up @@ -155,7 +160,6 @@ Social\ Connectivity\ Program\ Executables=Social\ Conectividad\ Programas\ Ejec
Social\ Connectivity\ Program\ Files=Social\ Conectividad\ Programas\ Archivos
GRRF\ Files=GRRF\ Archivos
Activities\ Sensor=Sensor\ de\ Actividades
Chat\ Activities=Chat\ Actividades
Credit\ Cards=Tarjetas\ de\ Crédito
Device\ Connectivity=Conectividad\ de\ Dispositivos
Device\ Events=Eventos\ de\ Dispositivos
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ WhatsApp\ Calls=WhatsApp\ Calls[TBT]
SMS\ Messages=SMS
MMS\ Messages=MMS
Instant\ Messages=Messages\ Instantanés
Messages=Messages
Chat\ Activities=Activités\ dans\ Chats
Message\ Attachments=Message\ Attachments[TBT]
Shared\ Contacts=Shared\ Contacts[TBT]
Shared\ Locations=Shared\ Locations[TBT]
Bluetooth\ Devices=Appareils\ Bluetooth
SIM\ Data=Données\ SIM
Calendar=Calendrier
Expand Down Expand Up @@ -155,7 +160,6 @@ Social\ Connectivity\ Program\ Executables=Executables\ Connectivité\ Sociale
Social\ Connectivity\ Program\ Files=Fichiers\ Connectivité\ Sociale
GRRF\ Files=Fichiers\ GRRF
Activities\ Sensor=Capteur\ d'Activités
Chat\ Activities=Activités\ dans\ Chats
Credit\ Cards=Cartes\ de\ Crédit
Device\ Connectivity=Connectivité\ de\ l'Appareil
Device\ Events=Évènements\ de\ l'Appareil
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ WhatsApp\ Calls=WhatsApp\ Calls[TBT]
SMS\ Messages=Messaggi\ SMS
MMS\ Messages=Messaggi\ MMS
Instant\ Messages=Messaggi\ istantanei
Messages=Messaggi
Chat\ Activities=Attività\ Chat
Message\ Attachments=Message\ Attachments[TBT]
Shared\ Contacts=Shared\ Contacts[TBT]
Shared\ Locations=Shared\ Locations[TBT]
Bluetooth\ Devices=Dispositivi\ Bluetooth
SIM\ Data=Dati\ SIM
Calendar=Calendario
Expand Down Expand Up @@ -155,7 +160,6 @@ Social\ Connectivity\ Program\ Executables=Eseguibili\ Software\ Connettività\
Social\ Connectivity\ Program\ Files=Software\ Connettività\ Sociale
GRRF\ Files=File\ GRRF
Activities\ Sensor=Attività\ Sensore
Chat\ Activities=Attività\ Chat
Credit\ Cards=Carte\ di\ Credito
Device\ Connectivity=Connectività\ Dispositivo
Device\ Events=Eventi\ Dispositivo
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ WhatsApp\ Calls=Chamadas\ WhatsApp
SMS\ Messages=Mensagens\ SMS
MMS\ Messages=Mensagens\ MMS
Instant\ Messages=Mensagens\ Instantâneas
Messages=Mensagens
Chat\ Activities=Atividades\ em\ Chats
Message\ Attachments=Anexos\ de\ Mensagens
Shared\ Contacts=Contatos\ Compartilhados
Shared\ Locations=Localizações\ Compartilhadas
Bluetooth\ Devices=Dispositivos\ Bluetooth
SIM\ Data=Dados\ SIM
Calendar=Calendário
Expand Down Expand Up @@ -155,7 +160,6 @@ Social\ Connectivity\ Program\ Executables=Executáveis\ Conectividade\ Social
Social\ Connectivity\ Program\ Files=Arquivos\ Conectividade\ Social
GRRF\ Files=Arquivos\ GRRF
Activities\ Sensor=Sensor\ de\ Atividades
Chat\ Activities=Atividades\ em\ Chats
Credit\ Cards=Cartões\ de\ Crédito
Device\ Connectivity=Conectividade\ de\ Dispositivos
Device\ Events=Eventos\ de\ Dispositivos
Expand Down

0 comments on commit e76af10

Please sign in to comment.