Merge branch '2024.11'

tine-groupware · Nov 28, 2024 · 12ffeb8 · 12ffeb8
2 parents f8d1a69 + 1d6a5a1
commit 12ffeb8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/tine20/Tinebase/js/tineInit.js b/tine20/Tinebase/js/tineInit.js
@@ -1211,8 +1211,8 @@ Tine.Tinebase.tineInit = {
      */
     checkServerUpdateRequired: function (registryData) {
         if (_.get(registryData, 'Tinebase.setupRequired')) {
-            const msg = i18n._('Tine 2.0 needs to be updated or is not installed yet.');
-            const title =  i18n._('Please wait or contact your administrator');
+            const msg = i18n._('tine needs to be updated or is not installed yet.');
+            const title = i18n._('Please wait or contact your administrator');
 
             Ext.MessageBox.show({
                 title : title,

diff --git a/tine20/Tinebase/js/widgets/VersionCheck.js b/tine20/Tinebase/js/widgets/VersionCheck.js
@@ -12,7 +12,7 @@
 Ext.ns('Tine.widgets');
 
 /**
- * check if newer version of Tine 2.0 is available
+ * check if newer version of tine is available
  * 
  * @namespace   Tine.widgets
  * @class       Tine.widgets.VersionCheck
@@ -48,17 +48,17 @@ Tine.widgets.VersionCheck = function() {
             var versionString = availableVersion.get('codeName') + ' ' + availableVersion.get('packageString');
             if (availableVersion.get('critical') == true) {
                 Ext.MessageBox.show({
-                    title: i18n._('New version of Tine 2.0 available'),
-                    msg: String.format(i18n._('Version "{0}" of Tine 2.0 is available.'), versionString) + "\n" +
+                    title: i18n._('New version of tine available'),
+                    msg: String.format(i18n._('Version "{0}" of tine is available.'), versionString) + "\n" +
                                  i18n._("It's a critical update and must be installed as soon as possible!"),
                     width: 500,
                     buttons: Ext.Msg.OK,
                     icon: Ext.MessageBox.ERROR
                 });
             } else {
                 Ext.MessageBox.show({
-                    title: i18n._('New version of Tine 2.0 available'),
-                    msg: String.format(i18n._('Version "{0}" of Tine 2.0 is available.'), versionString) + "\n" +
+                    title: i18n._('New version of tine available'),
+                    msg: String.format(i18n._('Version "{0}" of tine is available.'), versionString) + "\n" +
                                  i18n._('Please consider updating!'),
                     width: 400,
                     buttons: Ext.Msg.OK,

diff --git a/tine20/Tinebase/translations/de.po b/tine20/Tinebase/translations/de.po
@@ -1443,8 +1443,8 @@ msgid "A new client is available, press OK to get this version"
 msgstr "Ein neuer Client ist verfügbar, klicken Sie OK um die neue Version zu erhalten"
 
 #: js/tineInit.js:1214
-msgid "Tine 2.0 needs to be updated or is not installed yet."
-msgstr "Tine 2.0 muss aktualisiert werden oder ist noch nicht komplett installiert."
+msgid "tine needs to be updated or is not installed yet."
+msgstr "tine muss aktualisiert werden oder ist noch nicht komplett installiert."
 
 #: js/tineInit.js:1215
 msgid "Please wait or contact your administrator"
@@ -2180,13 +2180,13 @@ msgid "(shared)"
 msgstr "(geteilt)"
 
 #: js/widgets/VersionCheck.js:51 js/widgets/VersionCheck.js:60
-msgid "New version of Tine 2.0 available"
-msgstr "Eine neue Version von Tine 2.0 ist verfügbar."
+msgid "New version of tine available"
+msgstr "Eine neue Version von tine ist verfügbar."
 
 #: js/widgets/VersionCheck.js:52 js/widgets/VersionCheck.js:61
 #, python-brace-format
-msgid "Version \"{0}\" of Tine 2.0 is available."
-msgstr "Die Version \"{0}\" von Tine 2.0 ist verfügbar."
+msgid "Version \"{0}\" of tine is available."
+msgstr "Die Version \"{0}\" von tine ist verfügbar."
 
 #: js/widgets/VersionCheck.js:53
 msgid "It's a critical update and must be installed as soon as possible!"