From c92ccf8a44ca323d9ce14041dec6f7c881fa65b2 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Tue, 21 Feb 2017 02:23:19 -0500 Subject: [PATCH] Branding shtuffs for the Singularity --- indra/cmake/Variables.cmake | 2 ++ indra/lib/python/indra/util/llmanifest.py | 1 + indra/newview/CMakeLists.txt | 4 ++++ indra/newview/installers/windows/lang_da.nsi | 8 ++++---- indra/newview/installers/windows/lang_de.nsi | 8 ++++---- indra/newview/installers/windows/lang_es.nsi | 8 ++++---- indra/newview/installers/windows/lang_fr.nsi | 8 ++++---- indra/newview/installers/windows/lang_it.nsi | 8 ++++---- indra/newview/installers/windows/lang_pl.nsi | 8 ++++---- indra/newview/installers/windows/lang_pt-br.nsi | 8 ++++---- indra/newview/installers/windows/lang_ru.nsi | 8 ++++---- indra/newview/installers/windows/lang_tr.nsi | 8 ++++---- indra/newview/installers/windows/lang_zh.nsi | 8 ++++---- indra/newview/llappviewer.cpp | 2 +- indra/newview/llfloaterabout.cpp | 2 +- indra/newview/viewer_manifest.py | 11 +++++++---- 16 files changed, 56 insertions(+), 46 deletions(-) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index ea904742e..a422680e3 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -189,6 +189,8 @@ set(VIEWER_CHANNEL "Singularity Test" CACHE STRING "Viewer Channel Name") string(REPLACE " " "" VIEWER_CHANNEL_NOSPACE ${VIEWER_CHANNEL}) set(VIEWER_CHANNEL_NOSPACE ${VIEWER_CHANNEL_NOSPACE} CACHE STRING "Prefix used for resulting artifacts.") +set(VIEWER_BRANDING_ID "singularity" CACHE STRING "Viewer branding id") + set(ENABLE_SIGNING OFF CACHE BOOL "Enable signing the viewer") set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if necessary.") diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py index 8d9656778..5cd8220aa 100644 --- a/indra/lib/python/indra/util/llmanifest.py +++ b/indra/lib/python/indra/util/llmanifest.py @@ -106,6 +106,7 @@ ARGUMENTS=[ Example use: %(name)s --arch=i686 On Linux this would try to use Linux_i686Manifest.""", default=""), + dict(name='branding_id', description="Identifier for the branding set to use.", default='singularity'), dict(name='build', description='Build directory.', default=DEFAULT_SRCTREE), dict(name='buildtype', description='Build type (i.e. Debug, Release, RelWithDebInfo).', default=None), dict(name='configuration', diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 1b28fcdca..573d0962c 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1538,6 +1538,7 @@ if (WINDOWS) --actions=copy --arch=${ARCH} --artwork=${ARTWORK_DIR} + --branding_id=${VIEWER_BRANDING_ID} --build=${CMAKE_CURRENT_BINARY_DIR} --buildtype=${CMAKE_BUILD_TYPE} --configuration=${CMAKE_CFG_INTDIR} @@ -1592,6 +1593,7 @@ if (WINDOWS) ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py --arch=${ARCH} --artwork=${ARTWORK_DIR} + --branding_id=${VIEWER_BRANDING_ID} --build=${CMAKE_CURRENT_BINARY_DIR} --buildtype=${CMAKE_BUILD_TYPE} --channel=${VIEWER_CHANNEL} @@ -1689,6 +1691,7 @@ if (LINUX) ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py --arch=${ARCH} --artwork=${ARTWORK_DIR} + --branding_id=${VIEWER_BRANDING_ID} --build=${CMAKE_CURRENT_BINARY_DIR} --buildtype=${CMAKE_BUILD_TYPE} --channel=${VIEWER_CHANNEL} @@ -1712,6 +1715,7 @@ if (LINUX) --arch=${ARCH} --actions=copy --artwork=${ARTWORK_DIR} + --branding_id=${VIEWER_BRANDING_ID} --build=${CMAKE_CURRENT_BINARY_DIR} --buildtype=${CMAKE_BUILD_TYPE} --configuration=${CMAKE_CFG_INTDIR} diff --git a/indra/newview/installers/windows/lang_da.nsi b/indra/newview/installers/windows/lang_da.nsi index 11807202d..87e88492e 100644 --- a/indra/newview/installers/windows/lang_da.nsi +++ b/indra/newview/installers/windows/lang_da.nsi @@ -36,12 +36,12 @@ LangString CheckIfCurrentMB ${LANG_DANISH} "Det ser ud til at ${APPNAME} ${VERSI LangString MissingSSE2 ${LANG_DANISH} "This machine may not have a CPU with SSE2 support, which is required to run ${APPNAME} ${VERSION_LONG}. Do you want to continue?" ; closesecondlife function (install) -LangString CloseSecondLifeInstDP ${LANG_DANISH} "Venter på at Singularity skal lukke ned..." -LangString CloseSecondLifeInstMB ${LANG_DANISH} "Singularity kan ikke installeres mens programmet kører.$\n$\nAfslut programmet for at fortsætte.$\nVælg ANNULÉR for at afbryde installation." +LangString CloseSecondLifeInstDP ${LANG_DANISH} "Venter på at ${APPNAME} skal lukke ned..." +LangString CloseSecondLifeInstMB ${LANG_DANISH} "${APPNAME} kan ikke installeres mens programmet kører.$\n$\nAfslut programmet for at fortsætte.$\nVælg ANNULÉR for at afbryde installation." ; closesecondlife function (uninstall) -LangString CloseSecondLifeUnInstDP ${LANG_DANISH} "Venter på at Singularity skal lukke ned..." -LangString CloseSecondLifeUnInstMB ${LANG_DANISH} "Singularity kan ikke afinstalleres mens programmet kører.$\n$\nAfslut programmet for at fortsætte.$\nVælg ANNULÉR for at afbryde installation." +LangString CloseSecondLifeUnInstDP ${LANG_DANISH} "Venter på at ${APPNAME} skal lukke ned..." +LangString CloseSecondLifeUnInstMB ${LANG_DANISH} "${APPNAME} kan ikke afinstalleres mens programmet kører.$\n$\nAfslut programmet for at fortsætte.$\nVælg ANNULÉR for at afbryde installation." ; CheckNetworkConnection LangString CheckNetworkConnectionDP ${LANG_DANISH} "Checker netværksforbindelse..." diff --git a/indra/newview/installers/windows/lang_de.nsi b/indra/newview/installers/windows/lang_de.nsi index 763f88488..a9d99fb74 100644 --- a/indra/newview/installers/windows/lang_de.nsi +++ b/indra/newview/installers/windows/lang_de.nsi @@ -36,12 +36,12 @@ LangString CheckIfCurrentMB ${LANG_GERMAN} "Anscheinend ist ${APPNAME} ${VERSION LangString MissingSSE2 ${LANG_GERMAN} "Dieser PC besitzt möglicherweise keinen Prozessor mit SSE2-Unterstützung, die für die Ausführung von ${APPNAME} ${VERSION_LONG} benötigt wird. Trotzdem installieren?" ; closesecondlife function (install) -LangString CloseSecondLifeInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Singularity ..." -LangString CloseSecondLifeInstMB ${LANG_GERMAN} "Singularity kann nicht installiert oder ersetzt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Singularity zu beenden.$\nKlicken Sie CANCEL, um die Installation abzubrechen." +LangString CloseSecondLifeInstDP ${LANG_GERMAN} "Warten auf die Beendigung von ${APPNAME} ..." +LangString CloseSecondLifeInstMB ${LANG_GERMAN} "${APPNAME} kann nicht installiert oder ersetzt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um ${APPNAME} zu beenden.$\nKlicken Sie CANCEL, um die Installation abzubrechen." ; closesecondlife function (uninstall) -LangString CloseSecondLifeUnInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Singularity ..." -LangString CloseSecondLifeUnInstMB ${LANG_GERMAN} "Singularity kann nicht entfernt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Singularity zu beenden.$\nKlicken Sie CANCEL, um abzubrechen." +LangString CloseSecondLifeUnInstDP ${LANG_GERMAN} "Warten auf die Beendigung von ${APPNAME} ..." +LangString CloseSecondLifeUnInstMB ${LANG_GERMAN} "${APPNAME} kann nicht entfernt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um ${APPNAME} zu beenden.$\nKlicken Sie CANCEL, um abzubrechen." ; CheckNetworkConnection LangString CheckNetworkConnectionDP ${LANG_GERMAN} "Prüfe Netzwerkverbindung..." diff --git a/indra/newview/installers/windows/lang_es.nsi b/indra/newview/installers/windows/lang_es.nsi index b940e04c9..f4dd51a59 100644 --- a/indra/newview/installers/windows/lang_es.nsi +++ b/indra/newview/installers/windows/lang_es.nsi @@ -36,12 +36,12 @@ LangString CheckIfCurrentMB ${LANG_SPANISH} "Parece que ${APPNAME} ${VERSION_LON LangString MissingSSE2 ${LANG_SPANISH} "This machine may not have a CPU with SSE2 support, which is required to run ${APPNAME} ${VERSION_LONG}. Do you want to continue?" ; closesecondlife function (install) -LangString CloseSecondLifeInstDP ${LANG_SPANISH} "Esperando que Singularity se cierre..." -LangString CloseSecondLifeInstMB ${LANG_SPANISH} "Singularity no se puede instalar mientras esté en ejecución.$\n$\nTermine lo que esté haciendo y seleccione Aceptar (OK) para cerrar Singularity y continuar el proceso.$\nSeleccione Cancelar (CANCEL) para cancelar la instalación." +LangString CloseSecondLifeInstDP ${LANG_SPANISH} "Esperando que ${APPNAME} se cierre..." +LangString CloseSecondLifeInstMB ${LANG_SPANISH} "${APPNAME} no se puede instalar mientras esté en ejecución.$\n$\nTermine lo que esté haciendo y seleccione Aceptar (OK) para cerrar ${APPNAME} y continuar el proceso.$\nSeleccione Cancelar (CANCEL) para cancelar la instalación." ; closesecondlife function (uninstall) -LangString CloseSecondLifeUnInstDP ${LANG_SPANISH} "Esperando que Singularity se cierre..." -LangString CloseSecondLifeUnInstMB ${LANG_SPANISH} "Singularity no se puede desinstalar mientras esté en ejecución.$\n$\nTermine lo que esté haciendo y seleccione Aceptar (OK) para cerrar Singularity y continuar el proceso.$\nSeleccione Cancelar (CANCEL) para cancelar la desinstalación." +LangString CloseSecondLifeUnInstDP ${LANG_SPANISH} "Esperando que ${APPNAME} se cierre..." +LangString CloseSecondLifeUnInstMB ${LANG_SPANISH} "${APPNAME} no se puede desinstalar mientras esté en ejecución.$\n$\nTermine lo que esté haciendo y seleccione Aceptar (OK) para cerrar ${APPNAME} y continuar el proceso.$\nSeleccione Cancelar (CANCEL) para cancelar la desinstalación." ; CheckNetworkConnection LangString CheckNetworkConnectionDP ${LANG_SPANISH} "Comprobando la conexión de red..." diff --git a/indra/newview/installers/windows/lang_fr.nsi b/indra/newview/installers/windows/lang_fr.nsi index 095847082..6e11ffa6d 100644 --- a/indra/newview/installers/windows/lang_fr.nsi +++ b/indra/newview/installers/windows/lang_fr.nsi @@ -36,12 +36,12 @@ LangString CheckIfCurrentMB ${LANG_FRENCH} "Il semblerait que vous ayez déjà i LangString MissingSSE2 ${LANG_FRENCH} "This machine may not have a CPU with SSE2 support, which is required to run ${APPNAME} ${VERSION_LONG}. Do you want to continue?" ; closesecondlife function (install) -LangString CloseSecondLifeInstDP ${LANG_FRENCH} "En attente de la fermeture de Singularity..." -LangString CloseSecondLifeInstMB ${LANG_FRENCH} "Singularity ne peut pas être installé si l'application est déjà lancée..$\n$\nFinissez ce que vous faites puis sélectionnez OK pour fermer Singularity et continuer.$\nSélectionnez ANNULER pour annuler l'installation." +LangString CloseSecondLifeInstDP ${LANG_FRENCH} "En attente de la fermeture de ${APPNAME}..." +LangString CloseSecondLifeInstMB ${LANG_FRENCH} "${APPNAME} ne peut pas être installé si l'application est déjà lancée..$\n$\nFinissez ce que vous faites puis sélectionnez OK pour fermer ${APPNAME} et continuer.$\nSélectionnez ANNULER pour annuler l'installation." ; closesecondlife function (uninstall) -LangString CloseSecondLifeUnInstDP ${LANG_FRENCH} "En attente de la fermeture de Singularity..." -LangString CloseSecondLifeUnInstMB ${LANG_FRENCH} "Singularity ne peut pas être désinstallé si l'application est déjà lancée.$\n$\nFinissez ce que vous faites puis sélectionnez OK pour fermer Singularity et continuer.$\nSélectionnez ANNULER pour annuler la désinstallation." +LangString CloseSecondLifeUnInstDP ${LANG_FRENCH} "En attente de la fermeture de ${APPNAME}..." +LangString CloseSecondLifeUnInstMB ${LANG_FRENCH} "${APPNAME} ne peut pas être désinstallé si l'application est déjà lancée.$\n$\nFinissez ce que vous faites puis sélectionnez OK pour fermer ${APPNAME} et continuer.$\nSélectionnez ANNULER pour annuler la désinstallation." ; CheckNetworkConnection LangString CheckNetworkConnectionDP ${LANG_FRENCH} "Connexion au réseau en cours de vérification..." diff --git a/indra/newview/installers/windows/lang_it.nsi b/indra/newview/installers/windows/lang_it.nsi index 8153b73d4..465b13709 100644 --- a/indra/newview/installers/windows/lang_it.nsi +++ b/indra/newview/installers/windows/lang_it.nsi @@ -36,12 +36,12 @@ LangString CheckIfCurrentMB ${LANG_ITALIAN} "${APPNAME} ${VERSION_LONG} è stato LangString MissingSSE2 ${LANG_ITALIAN} "This machine may not have a CPU with SSE2 support, which is required to run ${APPNAME} ${VERSION_LONG}. Do you want to continue?" ; closesecondlife function (install) -LangString CloseSecondLifeInstDP ${LANG_ITALIAN} "In attesa che Singularity chiuda…" -LangString CloseSecondLifeInstMB ${LANG_ITALIAN} "Non è possibile installare Singularity se è già in funzione..$\n$\nTermina le operazioni in corso e scegli OK per chiudere Singularity e continuare.$\nScegli CANCELLA per annullare l’installazione." +LangString CloseSecondLifeInstDP ${LANG_ITALIAN} "In attesa che ${APPNAME} chiuda…" +LangString CloseSecondLifeInstMB ${LANG_ITALIAN} "Non è possibile installare ${APPNAME} se è già in funzione..$\n$\nTermina le operazioni in corso e scegli OK per chiudere ${APPNAME} e continuare.$\nScegli CANCELLA per annullare l’installazione." ; closesecondlife function (uninstall) -LangString CloseSecondLifeUnInstDP ${LANG_ITALIAN} "In attesa della chiusura di Singularity…" -LangString CloseSecondLifeUnInstMB ${LANG_ITALIAN} "Non è possibile installare Singularity se è già in funzione.$\n$\nTermina le operazioni in corso e scegli OK per chiudere Singularity e continuare.$\nScegli CANCELLA per annullare." +LangString CloseSecondLifeUnInstDP ${LANG_ITALIAN} "In attesa della chiusura di ${APPNAME}…" +LangString CloseSecondLifeUnInstMB ${LANG_ITALIAN} "Non è possibile installare ${APPNAME} se è già in funzione.$\n$\nTermina le operazioni in corso e scegli OK per chiudere ${APPNAME} e continuare.$\nScegli CANCELLA per annullare." ; CheckNetworkConnection LangString CheckNetworkConnectionDP ${LANG_ITALIAN} "Verifica connessione di rete in corso..." diff --git a/indra/newview/installers/windows/lang_pl.nsi b/indra/newview/installers/windows/lang_pl.nsi index 5c23d89fd..5e6c183b1 100644 --- a/indra/newview/installers/windows/lang_pl.nsi +++ b/indra/newview/installers/windows/lang_pl.nsi @@ -36,12 +36,12 @@ LangString CheckIfCurrentMB ${LANG_POLISH} "${APPNAME} ${VERSION_LONG} jest już LangString MissingSSE2 ${LANG_POLISH} "Ten komputer może nie mieć procesora z obsługą SSE2, który jest wymagany aby uruchomić ${APPNAME} w wersji ${VERSION_LONG}. Chcesz kontynuować?" ; closesecondlife function (install) -LangString CloseSecondLifeInstDP ${LANG_POLISH} "Oczekiwanie na zamknięcie Singularity..." -LangString CloseSecondLifeInstMB ${LANG_POLISH} "Singularity nie może zostać zainstalowane, ponieważ jest już włączone.$\n$\nZakończ swoje działania i wybierz OK aby zamknąć Singularity i kontynuować.$\nWybierz CANCEL aby anulować instalację." +LangString CloseSecondLifeInstDP ${LANG_POLISH} "Oczekiwanie na zamknięcie ${APPNAME}..." +LangString CloseSecondLifeInstMB ${LANG_POLISH} "${APPNAME} nie może zostać zainstalowane, ponieważ jest już włączone.$\n$\nZakończ swoje działania i wybierz OK aby zamknąć ${APPNAME} i kontynuować.$\nWybierz CANCEL aby anulować instalację." ; closesecondlife function (uninstall) -LangString CloseSecondLifeUnInstDP ${LANG_POLISH} "Oczekiwanie na zamknięcie Singularity..." -LangString CloseSecondLifeUnInstMB ${LANG_POLISH} "Singularity nie może zostać zainstalowane, ponieważ jest już włączone.$\n$\nZakończ swoje działania i wybierz OK aby zamknąć Singularity i kontynuować.$\nWybierz CANCEL aby anulować." +LangString CloseSecondLifeUnInstDP ${LANG_POLISH} "Oczekiwanie na zamknięcie ${APPNAME}..." +LangString CloseSecondLifeUnInstMB ${LANG_POLISH} "${APPNAME} nie może zostać zainstalowane, ponieważ jest już włączone.$\n$\nZakończ swoje działania i wybierz OK aby zamknąć ${APPNAME} i kontynuować.$\nWybierz CANCEL aby anulować." ; CheckNetworkConnection LangString CheckNetworkConnectionDP ${LANG_POLISH} "Sprawdzanie połączenia sieciowego..." diff --git a/indra/newview/installers/windows/lang_pt-br.nsi b/indra/newview/installers/windows/lang_pt-br.nsi index 8eaed25c5..6ddbadab5 100644 --- a/indra/newview/installers/windows/lang_pt-br.nsi +++ b/indra/newview/installers/windows/lang_pt-br.nsi @@ -36,12 +36,12 @@ LangString CheckIfCurrentMB ${LANG_PORTUGUESEBR} "Parece que o ${APPNAME} ${VERS LangString MissingSSE2 ${LANG_PORTUGUESEBR} "This machine may not have a CPU with SSE2 support, which is required to run ${APPNAME} ${VERSION_LONG}. Do you want to continue?" ; closesecondlife function (install) -LangString CloseSecondLifeInstDP ${LANG_PORTUGUESEBR} "Esperando o encerramento do Singularity..." -LangString CloseSecondLifeInstMB ${LANG_PORTUGUESEBR} "O Singularity não pode ser instalado enquanto ainda está sendo executado.$\n$\nTermine o que estava fazendo e selecione OK para fechar o Singularity e continuar.$\nSelecione CANCELAR para cancelar a instalação." +LangString CloseSecondLifeInstDP ${LANG_PORTUGUESEBR} "Esperando o encerramento do ${APPNAME}..." +LangString CloseSecondLifeInstMB ${LANG_PORTUGUESEBR} "O ${APPNAME} não pode ser instalado enquanto ainda está sendo executado.$\n$\nTermine o que estava fazendo e selecione OK para fechar o ${APPNAME} e continuar.$\nSelecione CANCELAR para cancelar a instalação." ; closesecondlife function (uninstall) -LangString CloseSecondLifeUnInstDP ${LANG_PORTUGUESEBR} "Esperando o encerramento do Singularity..." -LangString CloseSecondLifeUnInstMB ${LANG_PORTUGUESEBR} "O Singularity não pode ser desinstalado enquanto ainda está sendo executado.$\n$\nTermine o que estava fazendo e selecione OK para fechar o Singularity e continuar.$\nSelecione CANCELAR para cancelar." +LangString CloseSecondLifeUnInstDP ${LANG_PORTUGUESEBR} "Esperando o encerramento do ${APPNAME}..." +LangString CloseSecondLifeUnInstMB ${LANG_PORTUGUESEBR} "O ${APPNAME} não pode ser desinstalado enquanto ainda está sendo executado.$\n$\nTermine o que estava fazendo e selecione OK para fechar o ${APPNAME} e continuar.$\nSelecione CANCELAR para cancelar." ; CheckNetworkConnection LangString CheckNetworkConnectionDP ${LANG_PORTUGUESEBR} "Verificando a conexão de rede..." diff --git a/indra/newview/installers/windows/lang_ru.nsi b/indra/newview/installers/windows/lang_ru.nsi index e64e2b3e0..ed4cd47c6 100644 --- a/indra/newview/installers/windows/lang_ru.nsi +++ b/indra/newview/installers/windows/lang_ru.nsi @@ -36,12 +36,12 @@ LangString CheckIfCurrentMB ${LANG_RUSSIAN} "Вероятно, версия ${AP LangString MissingSSE2 ${LANG_RUSSIAN} "Возможно, на этом компьютере нет ЦП с поддержкой SSE2, которая необходима для работы ${APPNAME} ${VERSION_LONG}. Продолжить?" ; closesecondlife function (install) -LangString CloseSecondLifeInstDP ${LANG_RUSSIAN} "Ожидаю завершения работы Singularity..." -LangString CloseSecondLifeInstMB ${LANG_RUSSIAN} "Singularity уже работает, выполнить установку невозможно.$\n$\nЗавершите текущую операцию и нажмите кнопку «OK», чтобы закрыть Singularity и продолжить установку.$\nНажмите кнопку «ОТМЕНА» для отказа от установки." +LangString CloseSecondLifeInstDP ${LANG_RUSSIAN} "Ожидаю завершения работы ${APPNAME}..." +LangString CloseSecondLifeInstMB ${LANG_RUSSIAN} "${APPNAME} уже работает, выполнить установку невозможно.$\n$\nЗавершите текущую операцию и нажмите кнопку «OK», чтобы закрыть ${APPNAME} и продолжить установку.$\nНажмите кнопку «ОТМЕНА» для отказа от установки." ; closesecondlife function (uninstall) -LangString CloseSecondLifeUnInstDP ${LANG_RUSSIAN} "Ожидаю завершения работы Singularity..." -LangString CloseSecondLifeUnInstMB ${LANG_RUSSIAN} "Singularity уже работает, выполнить удаление невозможно.$\n$\nЗавершите текущую операцию и нажмите кнопку «OK», чтобы закрыть Singularity и продолжить удаление.$\nНажмите кнопку «ОТМЕНА» для отказа от удаления." +LangString CloseSecondLifeUnInstDP ${LANG_RUSSIAN} "Ожидаю завершения работы ${APPNAME}..." +LangString CloseSecondLifeUnInstMB ${LANG_RUSSIAN} "${APPNAME} уже работает, выполнить удаление невозможно.$\n$\nЗавершите текущую операцию и нажмите кнопку «OK», чтобы закрыть ${APPNAME} и продолжить удаление.$\nНажмите кнопку «ОТМЕНА» для отказа от удаления." ; CheckNetworkConnection LangString CheckNetworkConnectionDP ${LANG_RUSSIAN} "Проверка подключения к сети..." diff --git a/indra/newview/installers/windows/lang_tr.nsi b/indra/newview/installers/windows/lang_tr.nsi index 04da01bd2..262c32748 100644 --- a/indra/newview/installers/windows/lang_tr.nsi +++ b/indra/newview/installers/windows/lang_tr.nsi @@ -36,12 +36,12 @@ LangString CheckIfCurrentMB ${LANG_TURKISH} "${APPNAME} ${VERSION_LONG} zaten y LangString MissingSSE2 ${LANG_TURKISH} "Bu makinede SSE2 desteğine sahip bir CPU bulunmayabilir, ${APPNAME} ${VERSION_LONG} çalıştırmak için bu gereklidir. Devam etmek istiyor musunuz?" ; closesecondlife function (install) -LangString CloseSecondLifeInstDP ${LANG_TURKISH} "Singularity'ın kapatılması bekleniyor..." -LangString CloseSecondLifeInstMB ${LANG_TURKISH} "Singularity zaten çalışırken kapatılamaz.$\n$\nYaptığınız işi bitirdikten sonra Singularity'ı kapatmak ve devam etmek için Tamam seçimini yapın.$\nYüklemeyi iptal etmek için İPTAL seçimini yapın." +LangString CloseSecondLifeInstDP ${LANG_TURKISH} "${APPNAME}'ın kapatılması bekleniyor..." +LangString CloseSecondLifeInstMB ${LANG_TURKISH} "${APPNAME} zaten çalışırken kapatılamaz.$\n$\nYaptığınız işi bitirdikten sonra ${APPNAME}'ı kapatmak ve devam etmek için Tamam seçimini yapın.$\nYüklemeyi iptal etmek için İPTAL seçimini yapın." ; closesecondlife function (uninstall) -LangString CloseSecondLifeUnInstDP ${LANG_TURKISH} "Singularity'ın kapatılması bekleniyor..." -LangString CloseSecondLifeUnInstMB ${LANG_TURKISH} "Singularity zaten çalışırken kaldırılamaz.$\n$\nYaptığınız işi bitirdikten sonra Singularity'ı kapatmak ve devam etmek için Tamam seçimini yapın.$\nİptal etmek için İPTAL seçimini yapın." +LangString CloseSecondLifeUnInstDP ${LANG_TURKISH} "${APPNAME}'ın kapatılması bekleniyor..." +LangString CloseSecondLifeUnInstMB ${LANG_TURKISH} "${APPNAME} zaten çalışırken kaldırılamaz.$\n$\nYaptığınız işi bitirdikten sonra ${APPNAME}'ı kapatmak ve devam etmek için Tamam seçimini yapın.$\nİptal etmek için İPTAL seçimini yapın." ; CheckNetworkConnection LangString CheckNetworkConnectionDP ${LANG_TURKISH} "Ağ bağlantısı kontrol ediliyor..." diff --git a/indra/newview/installers/windows/lang_zh.nsi b/indra/newview/installers/windows/lang_zh.nsi index 906f036fa..10b9303c6 100644 --- a/indra/newview/installers/windows/lang_zh.nsi +++ b/indra/newview/installers/windows/lang_zh.nsi @@ -36,12 +36,12 @@ LangString CheckIfCurrentMB ${LANG_TRADCHINESE} "${APPNAME} ${VERSION_LONG} 版 LangString MissingSSE2 ${LANG_TRADCHINESE} "This machine may not have a CPU with SSE2 support, which is required to run ${APPNAME} ${VERSION_LONG}. Do you want to continue?" ; closesecondlife function (install) -LangString CloseSecondLifeInstDP ${LANG_TRADCHINESE} "等待 Singularity 停止運行…" -LangString CloseSecondLifeInstMB ${LANG_TRADCHINESE} "如果 Singularity 仍在運行，將無法進行安裝。$\n$\n請結束您在 Singularity 內的活動，然後選擇確定，將 Singularity 關閉，以繼續安裝。$\n選擇「取消」，取消安裝。" +LangString CloseSecondLifeInstDP ${LANG_TRADCHINESE} "等待 ${APPNAME} 停止運行…" +LangString CloseSecondLifeInstMB ${LANG_TRADCHINESE} "如果 ${APPNAME} 仍在運行，將無法進行安裝。$\n$\n請結束您在 ${APPNAME} 內的活動，然後選擇確定，將 ${APPNAME} 關閉，以繼續安裝。$\n選擇「取消」，取消安裝。" ; closesecondlife function (uninstall) -LangString CloseSecondLifeUnInstDP ${LANG_TRADCHINESE} "等待 Singularity 停止運行…" -LangString CloseSecondLifeUnInstMB ${LANG_TRADCHINESE} "如果 Singularity 仍在運行，將無法進行卸載。$\n$\n請結束您在 Singularity 內的活動，然後選擇確定，將 Singularity 關閉，以繼續卸載。$\n選擇「取消」，取消卸載。" +LangString CloseSecondLifeUnInstDP ${LANG_TRADCHINESE} "等待 ${APPNAME} 停止運行…" +LangString CloseSecondLifeUnInstMB ${LANG_TRADCHINESE} "如果 ${APPNAME} 仍在運行，將無法進行卸載。$\n$\n請結束您在 ${APPNAME} 內的活動，然後選擇確定，將 ${APPNAME} 關閉，以繼續卸載。$\n選擇「取消」，取消卸載。" ; CheckNetworkConnection LangString CheckNetworkConnectionDP ${LANG_TRADCHINESE} "正在檢查網路連接..." diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 19144195b..6cdf1fb46 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2434,7 +2434,7 @@ bool LLAppViewer::initConfiguration() } // XUI:translate - gSecondLife = "Singularity Viewer"; + gSecondLife = LLTrans::getString("APP_NAME"); // Read skin/branding settings if specified. //if (! gDirUtilp->getSkinDir().empty() ) diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index cd2cfdb17..48bf7a836 100644 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -362,7 +362,7 @@ void LLFloaterAbout::show(void*) static std::string get_viewer_release_notes_url() { - return "http://www.singularityviewer.org"; + return LLTrans::getString("APP_SITE"); /*std::ostringstream version; version << gVersionMajor << "." << gVersionMinor diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index e21f645d6..b979b10b0 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -144,6 +144,9 @@ class ViewerManifest(LLManifest): def grid(self): return self.args['grid'] + def viewer_branding_id(self): + return self.args['branding_id'] + def channel(self): return self.args['channel'] @@ -297,7 +300,7 @@ class WindowsManifest(ViewerManifest): if self.is_packaging_viewer(): # Find singularity-bin.exe in the 'configuration' dir, then rename it to the result of final_exe. - self.path(src='%s/singularity-bin.exe' % self.args['configuration'], dst=self.final_exe()) + self.path(src='%s/%s-bin.exe' % (self.args['configuration'],self.viewer_branding_id()), dst=self.final_exe()) # Plugin host application self.path2basename(os.path.join(os.pardir, @@ -572,7 +575,7 @@ class WindowsManifest(ViewerManifest): !define VENDORSTR "Singularity Viewer Project" """ - tempfile = "singularity_setup_tmp.nsi" + tempfile = "%s_setup_tmp.nsi" % self.viewer_branding_id() # the following replaces strings in the nsi template # it also does python-style % substitution self.replace_in("installers/windows/installer_template.nsi", tempfile, { @@ -981,7 +984,7 @@ class LinuxManifest(ViewerManifest): self.path("client-readme.txt","README-linux.txt") self.path("client-readme-voice.txt","README-linux-voice.txt") self.path("client-readme-joystick.txt","README-linux-joystick.txt") - self.path("wrapper.sh","singularity") + self.path("wrapper.sh",self.viewer_branding_id()) if self.prefix(src="", dst="etc"): self.path("handle_secondlifeprotocol.sh") self.path("register_secondlifeprotocol.sh") @@ -995,7 +998,7 @@ class LinuxManifest(ViewerManifest): # self.put_in_file(self.flags_list(), 'gridargs.dat') if self.prefix(src="", dst="bin"): - self.path("singularity-bin","do-not-directly-run-singularity-bin") + self.path("%s-bin"%self.viewer_branding_id(),"do-not-directly-run-%s-bin"%self.viewer_branding_id()) self.path2basename("../llplugin/slplugin", "SLPlugin") self.end_prefix("bin")