[Pkg-owncloud-commits] [owncloud-client] 06/47: - Replace undeclared variables: - PageReinstall_OLD_MUI_HEADER_TEXT_SUBTITLE - PageReinstall_OLD_Field_2 - PageReinstall_OLD_Field_3 - REVISION - README.md updated - calling bin/l10n.sh was missing

Sandro Knauß hefee-guest at moszumanska.debian.org
Mon Feb 17 18:06:32 UTC 2014 

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit fdf73fe539dde2c1f3c60ed8e59e4f16b872e9a9
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Wed Feb 5 11:58:53 2014 +0100

    - Replace undeclared variables:
      - PageReinstall_OLD_MUI_HEADER_TEXT_SUBTITLE
      - PageReinstall_OLD_Field_2
      - PageReinstall_OLD_Field_3
      - REVISION
    - README.md updated - calling bin/l10n.sh was missing
    
    This commit includes updated translations from transifex.
---
 admin/win/nsi/README.md             | 6 +++---
 admin/win/nsi/l10n/Japanese.nsh     | 2 +-
 admin/win/nsi/l10n/PortugueseBR.nsh | 4 ++--
 admin/win/nsi/l10n/languages.nsh    | 4 ++--
 cmake/modules/NSIS.template.in      | 8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/admin/win/nsi/README.md b/admin/win/nsi/README.md
index b1c4081..eac1239 100644
--- a/admin/win/nsi/README.md
+++ b/admin/win/nsi/README.md
@@ -8,11 +8,11 @@ Daily sync job: https://ci.owncloud.org/view/translation-sync/job/translation-sy
 
 ## How to add a new translation string?
 
-0. Add the variable holding the new translation string to l10n/declarations.nsh
-
-1. Add the string to the pofiles/messages.pot manually. This step is necessary
+0. Add the string to the pofiles/messages.pot manually. This step is necessary
 for the upload of strings to be translated to transifex
 
+1. Run bin/l10n.sh to properly generate declarations.nsh and English.nsh
+
 2. If you want to test your installer right away you need to add the new string
 at least to l10n/English.nsh
 
diff --git a/admin/win/nsi/l10n/Japanese.nsh b/admin/win/nsi/l10n/Japanese.nsh
index 3c4e573..a406dae 100644
--- a/admin/win/nsi/l10n/Japanese.nsh
+++ b/admin/win/nsi/l10n/Japanese.nsh
@@ -1,6 +1,6 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "�����[�X�m�[�g��\��"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "${processName} �̃v���Z�X��I������K�v������܂��B\n�C���X�g�[���[�����̃v���Z�X���~���Ă��낵���ł����H"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "${APPLICATION_EXECUTABLE} �̃v���Z�X��I������K�v������܂��B\n�C���X�g�[���[�����̃v���Z�X���~���Ă��낵���ł����H"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "${APPLICATION_EXECUTABLE} �v���Z�X���~���Ă��܂��B"
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "�I������v���Z�X������܂���"
 StrCpy $PageReinstall_NEW_Field_1 "�V�X�e���Ɂ@${APPLICATION_NAME}�@�̋��o�[�W�������C���X�g�[������Ă��܂��B\n���o�[�W������A���C���X�g�[�����A�ŐV�o�[�W������C���X�g�[������̂����߂��܂��B\n�I�y���[�V������I���A���ւ�N���b�N����B"
diff --git a/admin/win/nsi/l10n/PortugueseBR.nsh b/admin/win/nsi/l10n/PortugueseBR.nsh
index 6c57e78..2eab027 100644
--- a/admin/win/nsi/l10n/PortugueseBR.nsh
+++ b/admin/win/nsi/l10n/PortugueseBR.nsh
@@ -1,6 +1,6 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar notas de lan�amento"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Encontrados ${APPLICATION_EXECUTABLE} processo(s) que precisam ser interrompidos. $ \nVoc� quer que o instalador pare esses processos para voc�?"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Encontrados ${APPLICATION_EXECUTABLE} processo(s) que precisam ser interrompidos.$\nVoc� quer que o instalador pare esses processos para voc�?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Desativando ${APPLICATION_EXECUTABLE} processos."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Processo para eliminar n�o encontrado!"
 StrCpy $PageReinstall_NEW_Field_1 "Uma vers�o mais antiga de ${APPLICATION_NAME} est� instalado em seu sistema. � recomendado que voc� desinstale a vers�o atual antes de instalar. Selecione a opera��o que deseja executar e clique em Avan�ar para continuar."
@@ -26,7 +26,7 @@ StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} atalho."
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Atalho Desktop para ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Atalho R�pido para ${APPLICATION_NAME}."
 StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Remover ${APPLICATION_NAME}  pasta de dados de seu computador."
-StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Voc� quer apagar $ {APPLICATION_NAME} 's pasta de dados?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Voc� quer apagar ${APPLICATION_NAME} 's pasta de dados?"
 StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Deixe desmarcada para manter a pasta de dados para uso posterior ou cheque para excluir a pasta de dados."
 StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Sim, excluir essa pasta de dados."
 StrCpy $UNINSTALLER_FILE_Detail "Escrevendo Desinstalador"
diff --git a/admin/win/nsi/l10n/languages.nsh b/admin/win/nsi/l10n/languages.nsh
index 20ccedf..c33c14f 100644
--- a/admin/win/nsi/l10n/languages.nsh
+++ b/admin/win/nsi/l10n/languages.nsh
@@ -13,10 +13,10 @@
 !insertmacro MUI_LANGUAGE "PortugueseBR"
 !insertmacro MUI_LANGUAGE "Italian"
 !insertmacro MUI_LANGUAGE "Portuguese"
-!insertmacro MUI_LANGUAGE "Czech"
+!insertmacro MUI_LANGUAGE "German"
 !insertmacro MUI_LANGUAGE "Japanese"
 !insertmacro MUI_LANGUAGE "Galician"
-!insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "Czech"
 !insertmacro MUI_LANGUAGE "Slovak"
 !insertmacro MUI_LANGUAGE "Spanish"
 !insertmacro MUI_LANGUAGE "Polish"
diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in
index 17d7185..cae5552 100644
--- a/cmake/modules/NSIS.template.in
+++ b/cmake/modules/NSIS.template.in
@@ -304,9 +304,9 @@ Function PageReinstall
 
    older_version:
       !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" $PageReinstall_OLD_Field_1
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 2" "Text" $PageReinstall_OLD_Field_2
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" $PageReinstall_OLD_Field_3
-      !insertmacro MUI_HEADER_TEXT $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE $PageReinstall_OLD_MUI_HEADER_TEXT_SUBTITLE
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 2" "Text" $PageReinstall_NEW_Field_2
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" $PageReinstall_NEW_Field_3
+      !insertmacro MUI_HEADER_TEXT $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE
       StrCpy $R0 "1"
       Goto reinst_start
 
@@ -501,7 +501,7 @@ Section -post
    WriteRegStr ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}" "DisplayIcon" "$INSTDIR\Uninstall.exe,0"
    WriteRegStr ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}" "DisplayVersion" "${VERSION}"
    WriteRegDWORD ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}" "VersionMajor" "${VER_MAJOR}"
-   WriteRegDWORD ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}" "VersionMinor" "${VER_MINOR}.${REVISION}"
+   WriteRegDWORD ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}" "VersionMinor" "${VER_MINOR}.${VER_PATCH}.${VER_BUILD}"
    WriteRegStr ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}" "URLInfoAbout" "http://${APPLICATION_DOMAIN}/"
    WriteRegStr ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}" "HelpLink" "http://${APPLICATION_DOMAIN}/"
    WriteRegDWORD ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}" "NoModify" "1"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git

More information about the Pkg-owncloud-commits mailing list