diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2019-02-08 14:48:31 +0300 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2019-02-08 14:48:31 +0300 |
| commit | 597acba2741a2d3ca8a7c0ddde47b484f0df374d (patch) | |
| tree | a53c670925ebda93057d1c3530ad542ac4c579c4 /admin | |
| parent | c8ce40d5830dace6c33c2045ac3ef30ca1c3b3b1 (diff) | |
| parent | 0b8d591d2999b5d9915a65362127eecde25a1979 (diff) | |
Merge remote-tracking branch 'origin/2.5'
Conflicts:
VERSION.cmake
src/common/syncjournaldb.cpp
src/libsync/propagatedownload.cpp
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/win/nsi/l10n/Galician.nsh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/win/nsi/l10n/Galician.nsh b/admin/win/nsi/l10n/Galician.nsh index fc760dbc9..a549d59ec 100644 --- a/admin/win/nsi/l10n/Galician.nsh +++ b/admin/win/nsi/l10n/Galician.nsh @@ -9,6 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "Non desinstalar" StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Xa instalado" StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Escolla como quere instalar ${APPLICATION_NAME}." StrCpy $PageReinstall_OLD_Field_1 "Ten instalada unha versión actualizada do ${APPLICATION_NAME}! recomendámoslle que non instale unha versión anterior. Se realmente quere instalar esta versión máis antiga, é preferíbel que desinstale a versión actual antes de instalar. Seleccione a operación que quere realizar e prema en Seguinte para continuar." +StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} xa está instalado.$\r$\nSeleccione a operación que quere realizar e prema en Seguinte para continuar." StrCpy $PageReinstall_SAME_Field_2 "Engadir/reinstalar compoñentes" StrCpy $PageReinstall_SAME_Field_3 "Desinstalar ${APPLICATION_NAME}" StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalar ${APPLICATION_NAME}" @@ -40,4 +41,3 @@ StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Este desinstalador require acceso de admi StrCpy $UAC_ERROR_LOGON_SERVICE "O servizo de acceso non está en execución, cancelando!" StrCpy $INIT_UNINSTALLER_RUNNING "O desinstalador xa está en execución." StrCpy $SectionGroup_Shortcuts "Atallos" -StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue." |