Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Branding shtuffs for the Singularity

Browse Source
This commit is contained in:
Lirusaito
2017-02-21 02:23:19 -05:00
parent 1230748ef5
commit c92ccf8a44
16 changed files with 56 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/cmake/Variables.cmake
View File

@@ -189,6 +189,8 @@ set(VIEWER_CHANNEL "Singularity Test" CACHE STRING "Viewer Channel Name")
string(REPLACE " " "" VIEWER_CHANNEL_NOSPACE ${VIEWER_CHANNEL}) string(REPLACE " " "" VIEWER_CHANNEL_NOSPACE ${VIEWER_CHANNEL})
set(VIEWER_CHANNEL_NOSPACE ${VIEWER_CHANNEL_NOSPACE} CACHE STRING "Prefix used for resulting artifacts.") 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(ENABLE_SIGNING OFF CACHE BOOL "Enable signing the viewer")
set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if necessary.") set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if necessary.")

1
indra/lib/python/indra/util/llmanifest.py
View File

@@ -106,6 +106,7 @@ ARGUMENTS=[
Example use: %(name)s --arch=i686 Example use: %(name)s --arch=i686
On Linux this would try to use Linux_i686Manifest.""", On Linux this would try to use Linux_i686Manifest.""",
default=""), 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='build', description='Build directory.', default=DEFAULT_SRCTREE),
dict(name='buildtype', description='Build type (i.e. Debug, Release, RelWithDebInfo).', default=None), dict(name='buildtype', description='Build type (i.e. Debug, Release, RelWithDebInfo).', default=None),
dict(name='configuration', dict(name='configuration',

4
indra/newview/CMakeLists.txt
View File

@@ -1538,6 +1538,7 @@ if (WINDOWS)
--actions=copy --actions=copy
--arch=${ARCH} --arch=${ARCH}
--artwork=${ARTWORK_DIR} --artwork=${ARTWORK_DIR}
--branding_id=${VIEWER_BRANDING_ID}
--build=${CMAKE_CURRENT_BINARY_DIR} --build=${CMAKE_CURRENT_BINARY_DIR}
--buildtype=${CMAKE_BUILD_TYPE} --buildtype=${CMAKE_BUILD_TYPE}
--configuration=${CMAKE_CFG_INTDIR} --configuration=${CMAKE_CFG_INTDIR}
@@ -1592,6 +1593,7 @@ if (WINDOWS)
${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
--arch=${ARCH} --arch=${ARCH}
--artwork=${ARTWORK_DIR} --artwork=${ARTWORK_DIR}
--branding_id=${VIEWER_BRANDING_ID}
--build=${CMAKE_CURRENT_BINARY_DIR} --build=${CMAKE_CURRENT_BINARY_DIR}
--buildtype=${CMAKE_BUILD_TYPE} --buildtype=${CMAKE_BUILD_TYPE}
--channel=${VIEWER_CHANNEL} --channel=${VIEWER_CHANNEL}
@@ -1689,6 +1691,7 @@ if (LINUX)
${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
--arch=${ARCH} --arch=${ARCH}
--artwork=${ARTWORK_DIR} --artwork=${ARTWORK_DIR}
--branding_id=${VIEWER_BRANDING_ID}
--build=${CMAKE_CURRENT_BINARY_DIR} --build=${CMAKE_CURRENT_BINARY_DIR}
--buildtype=${CMAKE_BUILD_TYPE} --buildtype=${CMAKE_BUILD_TYPE}
--channel=${VIEWER_CHANNEL} --channel=${VIEWER_CHANNEL}
@@ -1712,6 +1715,7 @@ if (LINUX)
--arch=${ARCH} --arch=${ARCH}
--actions=copy --actions=copy
--artwork=${ARTWORK_DIR} --artwork=${ARTWORK_DIR}
--branding_id=${VIEWER_BRANDING_ID}
--build=${CMAKE_CURRENT_BINARY_DIR} --build=${CMAKE_CURRENT_BINARY_DIR}
--buildtype=${CMAKE_BUILD_TYPE} --buildtype=${CMAKE_BUILD_TYPE}
--configuration=${CMAKE_CFG_INTDIR} --configuration=${CMAKE_CFG_INTDIR}

8
indra/newview/installers/windows/lang_da.nsi
View File

@@ -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?" 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) ; closesecondlife function (install)
LangString CloseSecondLifeInstDP ${LANG_DANISH} "Venter på at Singularity skal lukke ned..." LangString CloseSecondLifeInstDP ${LANG_DANISH} "Venter på at ${APPNAME} 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 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) ; closesecondlife function (uninstall)
LangString CloseSecondLifeUnInstDP ${LANG_DANISH} "Venter på at Singularity skal lukke ned..." LangString CloseSecondLifeUnInstDP ${LANG_DANISH} "Venter på at ${APPNAME} 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 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 ; CheckNetworkConnection
LangString CheckNetworkConnectionDP ${LANG_DANISH} "Checker netværksforbindelse..." LangString CheckNetworkConnectionDP ${LANG_DANISH} "Checker netværksforbindelse..."

8
indra/newview/installers/windows/lang_de.nsi
View File

@@ -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?" 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) ; closesecondlife function (install)
LangString CloseSecondLifeInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Singularity ..." LangString CloseSecondLifeInstDP ${LANG_GERMAN} "Warten auf die Beendigung von ${APPNAME} ..."
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 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) ; closesecondlife function (uninstall)
LangString CloseSecondLifeUnInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Singularity ..." LangString CloseSecondLifeUnInstDP ${LANG_GERMAN} "Warten auf die Beendigung von ${APPNAME} ..."
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 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 ; CheckNetworkConnection
LangString CheckNetworkConnectionDP ${LANG_GERMAN} "Prüfe Netzwerkverbindung..." LangString CheckNetworkConnectionDP ${LANG_GERMAN} "Prüfe Netzwerkverbindung..."

8
indra/newview/installers/windows/lang_es.nsi
View File

@@ -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?" 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) ; closesecondlife function (install)
LangString CloseSecondLifeInstDP ${LANG_SPANISH} "Esperando que Singularity se cierre..." LangString CloseSecondLifeInstDP ${LANG_SPANISH} "Esperando que ${APPNAME} 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 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) ; closesecondlife function (uninstall)
LangString CloseSecondLifeUnInstDP ${LANG_SPANISH} "Esperando que Singularity se cierre..." LangString CloseSecondLifeUnInstDP ${LANG_SPANISH} "Esperando que ${APPNAME} 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 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 ; CheckNetworkConnection
LangString CheckNetworkConnectionDP ${LANG_SPANISH} "Comprobando la conexión de red..." LangString CheckNetworkConnectionDP ${LANG_SPANISH} "Comprobando la conexión de red..."

8
indra/newview/installers/windows/lang_fr.nsi
View File

@@ -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?" 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) ; closesecondlife function (install)
LangString CloseSecondLifeInstDP ${LANG_FRENCH} "En attente de la fermeture de Singularity..." LangString CloseSecondLifeInstDP ${LANG_FRENCH} "En attente de la fermeture de ${APPNAME}..."
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 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) ; closesecondlife function (uninstall)
LangString CloseSecondLifeUnInstDP ${LANG_FRENCH} "En attente de la fermeture de Singularity..." LangString CloseSecondLifeUnInstDP ${LANG_FRENCH} "En attente de la fermeture de ${APPNAME}..."
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 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 ; CheckNetworkConnection
LangString CheckNetworkConnectionDP ${LANG_FRENCH} "Connexion au réseau en cours de vérification..." LangString CheckNetworkConnectionDP ${LANG_FRENCH} "Connexion au réseau en cours de vérification..."

8
indra/newview/installers/windows/lang_it.nsi
View File

@@ -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?" 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) ; closesecondlife function (install)
LangString CloseSecondLifeInstDP ${LANG_ITALIAN} "In attesa che Singularity chiuda…" LangString CloseSecondLifeInstDP ${LANG_ITALIAN} "In attesa che ${APPNAME} 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 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) ; closesecondlife function (uninstall)
LangString CloseSecondLifeUnInstDP ${LANG_ITALIAN} "In attesa della chiusura di Singularity…" LangString CloseSecondLifeUnInstDP ${LANG_ITALIAN} "In attesa della chiusura di ${APPNAME}…"
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 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 ; CheckNetworkConnection
LangString CheckNetworkConnectionDP ${LANG_ITALIAN} "Verifica connessione di rete in corso..." LangString CheckNetworkConnectionDP ${LANG_ITALIAN} "Verifica connessione di rete in corso..."

8
indra/newview/installers/windows/lang_pl.nsi
View File

@@ -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ć?" 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) ; closesecondlife function (install)
LangString CloseSecondLifeInstDP ${LANG_POLISH} "Oczekiwanie na zamknięcie Singularity..." LangString CloseSecondLifeInstDP ${LANG_POLISH} "Oczekiwanie na zamknięcie ${APPNAME}..."
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 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) ; closesecondlife function (uninstall)
LangString CloseSecondLifeUnInstDP ${LANG_POLISH} "Oczekiwanie na zamknięcie Singularity..." LangString CloseSecondLifeUnInstDP ${LANG_POLISH} "Oczekiwanie na zamknięcie ${APPNAME}..."
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 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 ; CheckNetworkConnection
LangString CheckNetworkConnectionDP ${LANG_POLISH} "Sprawdzanie połączenia sieciowego..." LangString CheckNetworkConnectionDP ${LANG_POLISH} "Sprawdzanie połączenia sieciowego..."

8
indra/newview/installers/windows/lang_pt-br.nsi
View File

@@ -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?" 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) ; closesecondlife function (install)
LangString CloseSecondLifeInstDP ${LANG_PORTUGUESEBR} "Esperando o encerramento do Singularity..." LangString CloseSecondLifeInstDP ${LANG_PORTUGUESEBR} "Esperando o encerramento do ${APPNAME}..."
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 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) ; closesecondlife function (uninstall)
LangString CloseSecondLifeUnInstDP ${LANG_PORTUGUESEBR} "Esperando o encerramento do Singularity..." LangString CloseSecondLifeUnInstDP ${LANG_PORTUGUESEBR} "Esperando o encerramento do ${APPNAME}..."
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 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 ; CheckNetworkConnection
LangString CheckNetworkConnectionDP ${LANG_PORTUGUESEBR} "Verificando a conexão de rede..." LangString CheckNetworkConnectionDP ${LANG_PORTUGUESEBR} "Verificando a conexão de rede..."

8
indra/newview/installers/windows/lang_ru.nsi
View File

@@ -36,12 +36,12 @@ LangString CheckIfCurrentMB ${LANG_RUSSIAN} "Вероятно, версия ${AP
LangString MissingSSE2 ${LANG_RUSSIAN} "Возможно, на этом компьютере нет ЦП с поддержкой SSE2, которая необходима для работы ${APPNAME} ${VERSION_LONG}. Продолжить?" LangString MissingSSE2 ${LANG_RUSSIAN} "Возможно, на этом компьютере нет ЦП с поддержкой SSE2, которая необходима для работы ${APPNAME} ${VERSION_LONG}. Продолжить?"
; closesecondlife function (install) ; closesecondlife function (install)
LangString CloseSecondLifeInstDP ${LANG_RUSSIAN} "Ожидаю завершения работы Singularity..." LangString CloseSecondLifeInstDP ${LANG_RUSSIAN} "Ожидаю завершения работы ${APPNAME}..."
LangString CloseSecondLifeInstMB ${LANG_RUSSIAN} "Singularity уже работает, выполнить установку невозможно.$\n$\nЗавершите текущую операцию и нажмите кнопку «OK», чтобы закрыть Singularity и продолжить установку.$\nНажмите кнопку «ОТМЕНА» для отказа от установки." LangString CloseSecondLifeInstMB ${LANG_RUSSIAN} "${APPNAME} уже работает, выполнить установку невозможно.$\n$\nЗавершите текущую операцию и нажмите кнопку «OK», чтобы закрыть ${APPNAME} и продолжить установку.$\nНажмите кнопку «ОТМЕНА» для отказа от установки."
; closesecondlife function (uninstall) ; closesecondlife function (uninstall)
LangString CloseSecondLifeUnInstDP ${LANG_RUSSIAN} "Ожидаю завершения работы Singularity..." LangString CloseSecondLifeUnInstDP ${LANG_RUSSIAN} "Ожидаю завершения работы ${APPNAME}..."
LangString CloseSecondLifeUnInstMB ${LANG_RUSSIAN} "Singularity уже работает, выполнить удаление невозможно.$\n$\nЗавершите текущую операцию и нажмите кнопку «OK», чтобы закрыть Singularity и продолжить удаление.$\nНажмите кнопку «ОТМЕНА» для отказа от удаления." LangString CloseSecondLifeUnInstMB ${LANG_RUSSIAN} "${APPNAME} уже работает, выполнить удаление невозможно.$\n$\nЗавершите текущую операцию и нажмите кнопку «OK», чтобы закрыть ${APPNAME} и продолжить удаление.$\nНажмите кнопку «ОТМЕНА» для отказа от удаления."
; CheckNetworkConnection ; CheckNetworkConnection
LangString CheckNetworkConnectionDP ${LANG_RUSSIAN} "Проверка подключения к сети..." LangString CheckNetworkConnectionDP ${LANG_RUSSIAN} "Проверка подключения к сети..."

8
indra/newview/installers/windows/lang_tr.nsi
View File

@@ -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?" 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) ; closesecondlife function (install)
LangString CloseSecondLifeInstDP ${LANG_TURKISH} "Singularity'ın kapatılması bekleniyor..." LangString CloseSecondLifeInstDP ${LANG_TURKISH} "${APPNAME}'ı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 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) ; closesecondlife function (uninstall)
LangString CloseSecondLifeUnInstDP ${LANG_TURKISH} "Singularity'ın kapatılması bekleniyor..." LangString CloseSecondLifeUnInstDP ${LANG_TURKISH} "${APPNAME}'ı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 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 ; CheckNetworkConnection
LangString CheckNetworkConnectionDP ${LANG_TURKISH} "Ağ bağlantısı kontrol ediliyor..." LangString CheckNetworkConnectionDP ${LANG_TURKISH} "Ağ bağlantısı kontrol ediliyor..."

8
indra/newview/installers/windows/lang_zh.nsi
View File

@@ -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?" 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) ; closesecondlife function (install)
LangString CloseSecondLifeInstDP ${LANG_TRADCHINESE} "等待 Singularity 停止運行…" LangString CloseSecondLifeInstDP ${LANG_TRADCHINESE} "等待 ${APPNAME} 停止運行…"
LangString CloseSecondLifeInstMB ${LANG_TRADCHINESE} "如果 Singularity 仍在運行，將無法進行安裝。$\n$\n請結束您在 Singularity 內的活動，然後選擇確定，將 Singularity 關閉，以繼續安裝。$\n選擇「取消」，取消安裝。" LangString CloseSecondLifeInstMB ${LANG_TRADCHINESE} "如果 ${APPNAME} 仍在運行，將無法進行安裝。$\n$\n請結束您在 ${APPNAME} 內的活動，然後選擇確定，將 ${APPNAME} 關閉，以繼續安裝。$\n選擇「取消」，取消安裝。"
; closesecondlife function (uninstall) ; closesecondlife function (uninstall)
LangString CloseSecondLifeUnInstDP ${LANG_TRADCHINESE} "等待 Singularity 停止運行…" LangString CloseSecondLifeUnInstDP ${LANG_TRADCHINESE} "等待 ${APPNAME} 停止運行…"
LangString CloseSecondLifeUnInstMB ${LANG_TRADCHINESE} "如果 Singularity 仍在運行，將無法進行卸載。$\n$\n請結束您在 Singularity 內的活動，然後選擇確定，將 Singularity 關閉，以繼續卸載。$\n選擇「取消」，取消卸載。" LangString CloseSecondLifeUnInstMB ${LANG_TRADCHINESE} "如果 ${APPNAME} 仍在運行，將無法進行卸載。$\n$\n請結束您在 ${APPNAME} 內的活動，然後選擇確定，將 ${APPNAME} 關閉，以繼續卸載。$\n選擇「取消」，取消卸載。"
; CheckNetworkConnection ; CheckNetworkConnection
LangString CheckNetworkConnectionDP ${LANG_TRADCHINESE} "正在檢查網路連接..." LangString CheckNetworkConnectionDP ${LANG_TRADCHINESE} "正在檢查網路連接..."

2
indra/newview/llappviewer.cpp
View File

@@ -2434,7 +2434,7 @@ bool LLAppViewer::initConfiguration()
} }
// XUI:translate // XUI:translate
gSecondLife = "Singularity Viewer"; gSecondLife = LLTrans::getString("APP_NAME");
// Read skin/branding settings if specified. // Read skin/branding settings if specified.
//if (! gDirUtilp->getSkinDir().empty() ) //if (! gDirUtilp->getSkinDir().empty() )

2
indra/newview/llfloaterabout.cpp
View File

@@ -362,7 +362,7 @@ void LLFloaterAbout::show(void*)
static std::string get_viewer_release_notes_url() static std::string get_viewer_release_notes_url()
{ {
return "http://www.singularityviewer.org"; return LLTrans::getString("APP_SITE");
/*std::ostringstream version; /*std::ostringstream version;
version << gVersionMajor version << gVersionMajor
<< "." << gVersionMinor << "." << gVersionMinor

11
indra/newview/viewer_manifest.py
View File

@@ -144,6 +144,9 @@ class ViewerManifest(LLManifest):
def grid(self): def grid(self):
return self.args['grid'] return self.args['grid']
def viewer_branding_id(self):
return self.args['branding_id']
def channel(self): def channel(self):
return self.args['channel'] return self.args['channel']
@@ -297,7 +300,7 @@ class WindowsManifest(ViewerManifest):
if self.is_packaging_viewer(): if self.is_packaging_viewer():
# Find singularity-bin.exe in the 'configuration' dir, then rename it to the result of final_exe. # 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 # Plugin host application
self.path2basename(os.path.join(os.pardir, self.path2basename(os.path.join(os.pardir,
@@ -572,7 +575,7 @@ class WindowsManifest(ViewerManifest):
!define VENDORSTR "Singularity Viewer Project" !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 # the following replaces strings in the nsi template
# it also does python-style % substitution # it also does python-style % substitution
self.replace_in("installers/windows/installer_template.nsi", tempfile, { 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.txt","README-linux.txt")
self.path("client-readme-voice.txt","README-linux-voice.txt") self.path("client-readme-voice.txt","README-linux-voice.txt")
self.path("client-readme-joystick.txt","README-linux-joystick.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"): if self.prefix(src="", dst="etc"):
self.path("handle_secondlifeprotocol.sh") self.path("handle_secondlifeprotocol.sh")
self.path("register_secondlifeprotocol.sh") self.path("register_secondlifeprotocol.sh")
@@ -995,7 +998,7 @@ class LinuxManifest(ViewerManifest):
# self.put_in_file(self.flags_list(), 'gridargs.dat') # self.put_in_file(self.flags_list(), 'gridargs.dat')
if self.prefix(src="", dst="bin"): 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.path2basename("../llplugin/slplugin", "SLPlugin")
self.end_prefix("bin") self.end_prefix("bin")