Skip to content

Commit 64ac20c

Browse files
tecpromotiontecpromotion
committed
Merge branch '4.4-dev' into 5.2-dev
# Conflicts: # administrator/language/de-DE/install.xml # administrator/language/de-DE/langmetadata.xml # administrator/language/de-DE/plg_captcha_recaptcha.ini # administrator/language/de-DE/plg_captcha_recaptcha.sys.ini # administrator/language/de-DE/plg_captcha_recaptcha_invisible.ini # administrator/language/de-DE/plg_captcha_recaptcha_invisible.sys.ini # administrator/language/de-DE/plg_schemaorg_book.sys.ini # administrator/language/de-DE/plg_system_logrotation.ini # administrator/language/de-DE/plg_system_logrotation.sys.ini # administrator/language/de-DE/plg_system_sessiongc.ini # administrator/language/de-DE/plg_system_sessiongc.sys.ini # administrator/language/de-DE/plg_system_updatenotification.ini # administrator/language/de-DE/plg_system_updatenotification.sys.ini # administrator/language/de-DE/plg_task_demotasks.ini # administrator/language/de-DE/plg_task_demotasks.sys.ini # administrator/language/de-DE/plg_twofactorauth_totp.ini # administrator/language/de-DE/plg_twofactorauth_totp.sys.ini # administrator/language/de-DE/plg_twofactorauth_yubikey.ini # administrator/language/de-DE/plg_twofactorauth_yubikey.sys.ini # api/language/de-DE/install.xml # api/language/de-DE/langmetadata.xml # installation/language/de-DE/langmetadata.xml # installation/sql/mysql/localise.sql # language/de-DE/install.xml # language/de-DE/langmetadata.xml # pkg_de-DE.xml
2 parents dfd5f8d + c35f73f commit 64ac20c

File tree

536 files changed

+536
-536
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

536 files changed

+536
-536
lines changed

‎administrator/language/de-DE/com_actionlogs.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
; Joomla! German Translation
22
; (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
3-
; (C) Translation 2008 - 2024 J!German <https://www.jgerman.de>
3+
; (C) Translation 2008 - 2025 J!German <https://www.jgerman.de>
44
; License GNU General Public License version 2 or later; see LICENSE.txt
55
; Note : All ini files need to be saved as UTF-8
66

‎administrator/language/de-DE/com_actionlogs.sys.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
; Joomla! German Translation
22
; (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
3-
; (C) Translation 2008 - 2024 J!German <https://www.jgerman.de>
3+
; (C) Translation 2008 - 2025 J!German <https://www.jgerman.de>
44
; License GNU General Public License version 2 or later; see LICENSE.txt
55
; Note : All ini files need to be saved as UTF-8
66

‎administrator/language/de-DE/com_admin.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
; Joomla! German Translation
22
; (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
3-
; (C) Translation 2008 - 2024 J!German <https://www.jgerman.de>
3+
; (C) Translation 2008 - 2025 J!German <https://www.jgerman.de>
44
; License GNU General Public License version 2 or later; see LICENSE.txt
55
; Note : All ini files need to be saved as UTF-8
66

‎administrator/language/de-DE/com_admin.sys.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
; Joomla! German Translation
22
; (C) 2007 Open Source Matters, Inc. <https://www.joomla.org>
3-
; (C) Translation 2008 - 2024 J!German <https://www.jgerman.de>
3+
; (C) Translation 2008 - 2025 J!German <https://www.jgerman.de>
44
; License GNU General Public License version 2 or later; see LICENSE.txt
55
; Note : All ini files need to be saved as UTF-8
66

‎administrator/language/de-DE/com_ajax.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
; Joomla! German Translation
22
; (C) 2013 Open Source Matters, Inc. <https://www.joomla.org>
3-
; (C) Translation 2008 - 2024 J!German <https://www.jgerman.de>
3+
; (C) Translation 2008 - 2025 J!German <https://www.jgerman.de>
44
; License GNU General Public License version 2 or later; see LICENSE.txt
55
; Note : All ini files need to be saved as UTF-8
66

‎administrator/language/de-DE/com_ajax.sys.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
; Joomla! German Translation
22
; (C) 2013 Open Source Matters, Inc. <https://www.joomla.org>
3-
; (C) Translation 2008 - 2024 J!German <https://www.jgerman.de>
3+
; (C) Translation 2008 - 2025 J!German <https://www.jgerman.de>
44
; License GNU General Public License version 2 or later; see LICENSE.txt
55
; Note : All ini files need to be saved as UTF-8
66

‎administrator/language/de-DE/com_associations.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
; Joomla! German Translation
22
; (C) 2017 Open Source Matters, Inc. <https://www.joomla.org>
3-
; (C) Translation 2008 - 2024 J!German <https://www.jgerman.de>
3+
; (C) Translation 2008 - 2025 J!German <https://www.jgerman.de>
44
; License GNU General Public License version 2 or later; see LICENSE.txt
55
; Note : All ini files need to be saved as UTF-8
66

‎administrator/language/de-DE/com_associations.sys.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
; Joomla! German Translation
22
; (C) 2017 Open Source Matters, Inc. <https://www.joomla.org>
3-
; (C) Translation 2008 - 2024 J!German <https://www.jgerman.de>
3+
; (C) Translation 2008 - 2025 J!German <https://www.jgerman.de>
44
; License GNU General Public License version 2 or later; see LICENSE.txt
55
; Note : All ini files need to be saved as UTF-8
66

‎administrator/language/de-DE/com_banners.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
; Joomla! German Translation
22
; (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
3-
; (C) Translation 2008 - 2024 J!German <https://www.jgerman.de>
3+
; (C) Translation 2008 - 2025 J!German <https://www.jgerman.de>
44
; License GNU General Public License version 2 or later; see LICENSE.txt
55
; Note : All ini files need to be saved as UTF-8
66

‎administrator/language/de-DE/com_banners.sys.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
; Joomla! German Translation
22
; (C) 2007 Open Source Matters, Inc. <https://www.joomla.org>
3-
; (C) Translation 2008 - 2024 J!German <https://www.jgerman.de>
3+
; (C) Translation 2008 - 2025 J!German <https://www.jgerman.de>
44
; License GNU General Public License version 2 or later; see LICENSE.txt
55
; Note : All ini files need to be saved as UTF-8
66

0 commit comments

Comments
 (0)