Skip to content

Merge Branch 3.10-dev into 4.0-dev #2230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zero-24 merged 2 commits into from
Jan 17, 2022
Merged

Merge Branch 3.10-dev into 4.0-dev #2230

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2e6f8d
Merge Branch 3.10-dev into 4.0-dev
tecpromotion Jan 17, 2022
4844c5d
Update administrator/language/de-DE/com_joomlaupdate.ini
tecpromotion Jan 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion administrator/language/de-DE/com_joomlaupdate.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLAGAIN="Neuinstallation der Joomla-Core-Date
COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLED="Installierte Joomla-Version"
COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLUPDATE="Update"
COM_JOOMLAUPDATE_VIEW_DEFAULT_LATEST="Aktuellste Joomla-Version"
COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_DOWNLOAD_URL="Es konnte keine Download-URL gefunden werden"
COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_DOWNLOAD_URL="Update nicht verfügbar"
COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_DOWNLOAD_URL_DESC="Ein Update für Joomla! %1$s wurde gefunden, allerdings konnte die Download-URL nicht ermittelt werden. Bitte das Update-Paket von der <a href='https://downloads.joomla.org/latest' target='_blank' rel='noopener noreferrer'>offiziellen Joomla-Downloadsite (engl.)</a> herunterladen und anschließend die Funktion „Hochladen & Aktualisieren“ nutzen."
COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_LIVE_UPDATE="Das Live-Update ist nicht verfügbar!"
COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_LIVE_UPDATE_DESC="Eine neuere Version der Joomla-Update-Komponente ist verfügbar und muss vorher installiert werden. <a class='alert-link' href='index.php?option=com_installer&view=update' target='_blank' rel='noopener noreferrer'>Hier klicken, um die Komponente zu aktualisieren</a>."
Expand Down