livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
79,906 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

290 Commits (b49c3a083b73f6a5762f353f618a2e1fe25cf690)

Author SHA1 Message Date
PanteraPolnocy 8dc7ab1171 FIRE-36167 French translation update, by Laurent Bechir 
Signed-off-by: PanteraPolnocy <panterapolnocy@gmail.com>
 2025-11-30 17:35:59 +01:00
PanteraPolnocy f4504d4eef FIRE-35853, FIRE-35846, FIRE-35840 Updated Chinese (小滢 Zi Ying), French (Laurent Bechir), Japanese (Logue Takacs) and Polish translations 2025-08-13 20:20:04 +02:00
PanteraPolnocy a51ded5a26 FIRE-35782 French translation update, by Laurent Bechir 2025-07-19 15:02:47 +02:00
PanteraPolnocy 399a14db55 FIRE-35541 French translation update, by Laurent Bechir 2025-05-22 20:27:27 +02:00
PanteraPolnocy 5cd2d7ca78 FIRE-35506 French translation update, by Laurent Bechir 2025-05-17 16:32:18 +02:00
PanteraPolnocy ca164a0f51 Alter Flickr url in all applicable places 2025-04-24 13:48:16 +02:00
PanteraPolnocy 9890f07ba7 FIRE-35373, FIRE-35401: Chinese (小滢 Zi Ying), French (Laurent Bechir) and Polish translation updates 2025-04-24 13:45:46 +02:00
PanteraPolnocy 33d1961a7e Add the '[UNTRUSTED_URL]' across all languages 2025-02-23 15:37:39 +01:00
PanteraPolnocy b0c594e946 Forgot about this 2024-12-22 16:18:13 +01:00
PanteraPolnocy 40e7f850e6 FIRE-34972, FIRE-34975, FIRE-34985 French (by Laurent Bechir), Italian (by Spartaco Zemenis) and Russian (by Romka Swallowtail) translations updates 2024-12-22 16:15:02 +01:00
PanteraPolnocy 4c85c86de1 Post-merge translations cleanup, various langauges 2024-12-19 10:35:29 +01:00
Ansariel b077fb9091 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	indra/newview/app_settings/settings.xml
 2024-11-14 19:05:50 +01:00
PanteraPolnocy db757589cd FIRE-34831 French translation update, by Laurent Bechir 2024-11-09 23:22:55 +01:00
Ansariel 064f6dacc5 Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llhudtext.h
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/de/notifications.xml
#	indra/newview/skins/default/xui/es/notifications.xml
#	indra/newview/skins/default/xui/fr/notifications.xml
#	indra/newview/skins/default/xui/it/notifications.xml
#	indra/newview/skins/default/xui/ja/notifications.xml
#	indra/newview/skins/default/xui/pt/notifications.xml
 2024-09-26 22:10:24 +02:00
Andrey Kleshchev cd8b0a4fc9 Revert "viewer#2413 Remove obsolete alert about expiring voice morphs" 
This reverts commit 5c16ae1375.
Fix is correct, but should wait untill server sided fix gets deployed.
 2024-09-25 09:38:54 +03:00
Ansariel 82e8fd1671 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	indra/llrender/llgl.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/skins/default/xui/en/notifications.xml
 2024-09-09 19:50:00 +02:00
Ansariel 9aa5e5f2e3 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-09-09 17:56:52 +02:00
PanteraPolnocy df4229adc1 FIRE-34479 French translation update, by Laurent Bechir 2024-09-07 11:49:49 +02:00
Ansariel 9573cc8e00 Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/de/notifications.xml
#	indra/newview/skins/default/xui/es/notifications.xml
#	indra/newview/skins/default/xui/fr/notifications.xml
#	indra/newview/skins/default/xui/it/notifications.xml
#	indra/newview/skins/default/xui/ja/notifications.xml
#	indra/newview/skins/default/xui/pt/notifications.xml
#	indra/newview/skins/default/xui/ru/notifications.xml
 2024-08-27 19:39:23 +02:00
Andrey Kleshchev 5c16ae1375 viewer#2413 Remove obsolete alert about expiring voice morphs 2024-08-27 19:19:44 +03:00
Ansariel 3d9414c1f2 Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llui/llfloaterreg.cpp
#	indra/llui/llnotifications.cpp
#	indra/llui/llpanel.cpp
#	indra/llui/llui.cpp
#	indra/llui/lluicolortable.cpp
#	indra/llui/lluicolortable.h
#	indra/newview/llappviewer.h
#	indra/newview/llfloatersidepanelcontainer.cpp
#	indra/newview/llfloatersidepanelcontainer.h
#	indra/newview/llpanelpeoplemenus.cpp
#	indra/newview/llviewermenufile.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
 2024-07-03 01:11:47 +02:00
PanteraPolnocy b0cc304f39 FIRE-34032, FIRE-34031: Updated French (by Laurent Bechir), Russian (by Romka Swallowtail) and Polish translations 2024-06-14 19:10:07 +02:00
PanteraPolnocy 257e9b30d6 FIRE-33931 French translation update, by Laurent Bechir 2024-05-18 17:20:14 +02:00
PanteraPolnocy b6bdad2928 FIRE-33914, FIRE-33915 French (by Laurent Bechir) and Russian (by Romka Swallowtail) translation updates 2024-05-12 20:05:41 +02:00
PanteraPolnocy b25c6cc0b4 FIRE-33872 French translation update, by Laurent Bechir 2024-04-26 15:43:27 +02:00
PanteraPolnocy e61942f3d6 Minor changes across various translations 2024-04-14 21:09:24 +02:00
PanteraPolnocy 061a5a1341 FIRE-33700 French translation update, by Laurent Bechir 2024-02-16 17:27:05 +01:00
PanteraPolnocy 3f1ee69ed6 FIRE-33393 French translation update, by Laurent Bechir (+ Polish, too) 2023-11-25 13:44:44 +01:00
PanteraPolnocy 39f8e49aee FIRE-33290 French translation update, by Laurent Bechir 2023-10-08 23:09:08 +02:00
PanteraPolnocy 954fb5fbaf FIRE-33090 French translation update, by Laurent Bechir 2023-07-18 18:36:08 +02:00
PanteraPolnocy ae53593dad FIRE-32842, FIRE-32841 Updated Russian translation (by Romka Swallowtail), French translation (by Laurent Bechir) and Polish one; Alpha channel related 2023-03-30 00:30:48 +02:00
PanteraPolnocy ea2fa8db13 FIRE-32739 French translation update, by Laurent Bechir 2023-02-19 06:26:24 +01:00
Andrey Lihatskiy 11b9b6f5f8 INTL-477 Translation update for Maint S 2023-01-24 15:01:53 +02:00
Ansariel 2507bc6137 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-09-15 20:37:16 +02:00
Ansariel db864c11cd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-09-13 20:14:22 +02:00
Ansariel ca273864c2 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-09-13 18:56:38 +02:00
PanteraPolnocy 737b9b72e1 FIRE-32041 French translation update, by Laurent Bechir 2022-09-08 20:10:50 +02:00
Ansariel c6fb722792 Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer 2022-08-31 17:57:06 +02:00
Ansariel 2f42e999e0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/llhudtext.cpp
#	indra/newview/llpanelpicks.cpp
#	indra/newview/llpanelprofile.cpp
 2022-08-31 16:04:49 +02:00
Ansariel 18341f0d76 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-30 23:19:12 +02:00
PanteraPolnocy e89717da5c The newline characters do not really work in these notifications 2022-08-28 23:23:45 +02:00
PanteraPolnocy 55b1c87dd2 fire-31957 fire-31961 updates for french (laurent bechir) russian (romka swallowtail) and polish translations 2022-08-19 10:00:31 +02:00
Ansariel 83e61b2d5a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-10 19:04:35 +02:00
PanteraPolnocy c9728f1208 FIRE-31916 French translation update, by Laurent Bechir 2022-08-08 19:45:27 +02:00
PanteraPolnocy 20c075e6c4 FIRE-31900 French translation update (copypaste), by Laurent Bechir 2022-08-06 13:05:35 +02:00
Ansariel d7953c1e94 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-02 12:03:54 +02:00
Ansariel 034882cbeb Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-07-29 13:13:44 +02:00
Pantera fad265af9c FIRE-31854 French translation update, by Laurent Bechir 
Plus a minor Polish change
 2022-07-28 13:57:58 +02:00
Ansariel 7d7aff4377 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 
# Conflicts:
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodel.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
#	indra/newview/llinventorymodel.h
 2022-05-28 23:00:17 +02:00
Ansariel b61dfd131d Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-26 11:36:16 +02:00