Merge branch '2024.11'

tine-groupware · Dec 20, 2024 · c29ba1a · c29ba1a
2 parents 1c276b5 + b584466
commit c29ba1a
Show file tree

Hide file tree

Showing 16 changed files with 151 additions and 32 deletions.
diff --git a/tine20/Calendar/js/floorplan/src/App.vue b/tine20/Calendar/js/floorplan/src/App.vue
@@ -191,13 +191,13 @@ const modalProps = computed(() => {
       }
     } else if (modalData.reservationEvent.deletable) {
       modalTitle = formatMessage("Resource: {name} reserved by you", {name: modalData.reservableObj.displayName})
-      modalContent = formatMessage(`Do you want to delete your reservation ?`)
+      modalContent = formatMessage('Do you want to delete your reservation ?')
       modalAction = async () => {
         await deleteReservation(modalData.reservableObj.name)
       }
     } else {
-      modalTitle = formatMessage(`Resource: {name} already reserved`, {name: modalData.reservableObj.displayName})
-      modalContent = formatMessage(`The resource {name} on floor {floorName} is reserved for selected date: {date} by {name1}.`, {
+      modalTitle = formatMessage('Resource: {name} already reserved', {name: modalData.reservableObj.displayName})
+      modalContent = formatMessage('The resource {name} on floor {floorName} is reserved for selected date: {date} by {name1}.', {
         name: modalData.reservableObj.displayName,
         floorName: currentFloor.value.name,
         date: selectedDate.value,

diff --git a/tine20/Calendar/translations/de.po b/tine20/Calendar/translations/de.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tine-groupware\n"
 "POT-Creation-Date: 2008-05-17 22:12+0100\n"
-"PO-Revision-Date: 2012-04-02 12:18+0000\n"
+"PO-Revision-Date: 2024-12-10 09:54+0100\n"
 "Last-Translator: pschuele <[email protected]>, 2012\n"
 "Language-Team: German (http://app.transifex.com/tine/groupware/language/"
 "de/)\n"
@@ -28,9 +28,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Country: GB\n"
-"X-Poedit-Language: en\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"X-Generator: Poedit 3.4.2\n"
 
 msgid "manage shared calendars"
 msgstr "Gemeinsame Kalender Verwalten"
@@ -1811,6 +1810,9 @@ msgstr "Jedes {0}. Jahr"
 msgid "of"
 msgstr "im"
 
+msgid "Individual Dates"
+msgstr "Einzeltermine"
+
 msgid "Date"
 msgstr "Datum"
 
@@ -2175,8 +2177,20 @@ msgstr "Der definitive Termin wurde auf den „%1$s“ gelegt."
 msgid "You can review the poll results here:"
 msgstr "Sie können die Umfrageergebnisse hier einsehen:"
 
-msgid "Individual Dates"
-msgstr "Einzeltermine"
+msgid "Do you want to delete your reservation ?"
+msgstr "Möchten sie ihre Reservierung löschen?"
+
+#, python-brace-format
+msgid "Resource: {name} already reserved"
+msgstr "Die Resource {name} ist bereits reserviert"
+
+#, python-brace-format
+msgid ""
+"The resource {name} on floor {floorName} is reserved for selected date: "
+"{date} by {name1}."
+msgstr ""
+"Die Resource {name} im Stock {floorName} ist bereits am {date} von {name1} "
+"reserviert."
 
 msgid "Force update of existing events"
 msgstr "Erzwinge Aktualisierung von existierenden Terminen"
@@ -2330,19 +2344,6 @@ msgstr "Thema ⏎ Organisator ⏎ Lokalität"
 msgid "Reserve Resource: %1$s"
 msgstr "Reserviere Resource: %1$s"
 
-msgid "Do you want to delete your reservation ?"
-msgstr "Wollen Sie Ihre Reservierung löschen ?"
-
-msgid "Resource: {name} already reserved"
-msgstr "Resource: {name} schon reserviert"
-
-msgid ""
-"The resource {name} on floor {floorName} is reserved for selected date: "
-"{date} by {name1}."
-msgstr ""
-"Die Resource {name} im Stock {floorName} ist von {name1} für den Tag: "
-"{date} reserviert."
-
 msgid "The container already exists"
 msgstr "Der Container existiert bereits"
 

diff --git a/tine20/Calendar/translations/en.po b/tine20/Calendar/translations/en.po
@@ -825,6 +825,17 @@ msgstr "Do you want to reserve the resource {name} on floor {floorName} for {dat
 msgid "Resource: {name} reserved by you"
 msgstr "Resource: {name} reserved by you"
 
+msgid "Do you want to delete your reservation ?"
+msgstr "Do you want to delete your reservation ?"
+
+#, python-brace-format
+msgid "Resource: {name} already reserved"
+msgstr "Resource: {name} already reserved"
+
+#, python-brace-format
+msgid "The resource {name} on floor {floorName} is reserved for selected date: {date} by {name1}."
+msgstr "The resource {name} on floor {floorName} is reserved for selected date: {date} by {name1}."
+
 msgid "Floorplan"
 msgstr "Floorplan"
 

diff --git a/tine20/Calendar/translations/template.pot b/tine20/Calendar/translations/template.pot
@@ -825,6 +825,17 @@ msgstr ""
 msgid "Resource: {name} reserved by you"
 msgstr ""
 
+msgid "Do you want to delete your reservation ?"
+msgstr ""
+
+#, python-brace-format
+msgid "Resource: {name} already reserved"
+msgstr ""
+
+#, python-brace-format
+msgid "The resource {name} on floor {floorName} is reserved for selected date: {date} by {name1}."
+msgstr ""
+
 msgid "Floorplan"
 msgstr ""
 

diff --git a/tine20/OnlyOfficeIntegrator/js/OnlyOfficeEditDialog.js b/tine20/OnlyOfficeIntegrator/js/OnlyOfficeEditDialog.js
@@ -304,7 +304,7 @@ Tine.OnlyOfficeIntegrator.OnlyOfficeEditDialog = Ext.extend(Ext.Panel, {
             this.docEditor.setHistoryData(historyData);
         } catch (err) {
             this.docEditor.setHistoryData({
-                "error": this.app.i18n._(`Version details for version ${version} not available.`),
+                "error": this.app.i18n.formatMessage('Version details for version { version } not available.', {version}),
                 "version": version
             });
         }

diff --git a/tine20/OnlyOfficeIntegrator/translations/de.po b/tine20/OnlyOfficeIntegrator/translations/de.po
@@ -130,6 +130,9 @@ msgstr "Kopie speichern als"
 msgid "Exporting Document ..."
 msgstr "Dokument wird exportiert…"
 
+msgid "Version details for version { version } not available."
+msgstr "Details zur Versoin { version } sind nicht verfügbar."
+
 msgid "Overwrite Existing File?"
 msgstr "Bestehende Datei überschreiben?"
 

diff --git a/tine20/OnlyOfficeIntegrator/translations/en.po b/tine20/OnlyOfficeIntegrator/translations/en.po
@@ -5,7 +5,6 @@ msgstr ""
 "PO-Revision-Date: 2008-07-29 21:14+0100\n"
 "Last-Translator: Cornelius Weiss <[email protected]>\n"
 "Language-Team: Tine 2.0 Translators\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -126,6 +125,9 @@ msgstr "Save Copy As"
 msgid "Exporting Document ..."
 msgstr "Exporting Document ..."
 
+msgid "Version details for version { version } not available."
+msgstr "Version details for version { version } not available."
+
 msgid "Overwrite Existing File?"
 msgstr "Overwrite Existing File?"
 

diff --git a/tine20/OnlyOfficeIntegrator/translations/template.pot b/tine20/OnlyOfficeIntegrator/translations/template.pot
@@ -125,6 +125,9 @@ msgstr ""
 msgid "Exporting Document ..."
 msgstr ""
 
+msgid "Version details for version { version } not available."
+msgstr ""
+
 msgid "Overwrite Existing File?"
 msgstr ""
 

diff --git a/tine20/Timetracker/js/TimesheetGridPanel.js b/tine20/Timetracker/js/TimesheetGridPanel.js
@@ -21,7 +21,7 @@ Ext.namespace('Tine.Timetracker');
  * <p><pre>
  * </pre></p>
  * 
- * @license     http://www.gnu.org/licenses/agpl.html AGPL Version 3
+ * @license     http://www.gnu.org/licenses/agpl.html AGPL Version 3q
  * @author      Philipp Schüle <[email protected]>
  * 
  * @param       {Object} config
@@ -88,12 +88,12 @@ Tine.Timetracker.TimesheetGridPanel = Ext.extend(Tine.widgets.grid.GridPanel, {
             this.pagingToolbar.items.get('wt-bar').update(Ext.ux.PercentRenderer({
                 qtitle: this.app.i18n._('Working Time Statistics'),
                 qtip:
-                    this.app.formatMessage(`Working Time Target: { target }`, {
+                    this.app.formatMessage('Working Time Target: { target }', {
                         target: Ext.ux.form.DurationSpinner.durationRenderer(data.workingTimeTarget, {
                             baseUnit: 'seconds'
                         })
                     }) + "<br>" +
-                    this.app.formatMessage(`Working Time Recorded: { recorded }`, {
+                    this.app.formatMessage('Working Time Recorded: { recorded }', {
                         recorded: Ext.ux.form.DurationSpinner.durationRenderer(data.totalsum || 0, {
                             baseUnit: 'minutes'
                         })
@@ -108,8 +108,8 @@ Tine.Timetracker.TimesheetGridPanel = Ext.extend(Tine.widgets.grid.GridPanel, {
             this.pagingToolbar.items.get('to-bar').update(Ext.ux.PercentRenderer({
                 qtitle: this.app.i18n._('Turnover Statistics'),
                 qtip:
-                    this.app.formatMessage(`Turnover Target: { target }`, {target: Ext.util.Format.money(data.turnOverGoal)}) + "<br>" +
-                    this.app.formatMessage(`Turnover Recorded: { recorded }`, {recorded: Ext.util.Format.money(data.clearedAmount || 0)}),
+                    this.app.formatMessage('Turnover Target: { target }', {target: Ext.util.Format.money(data.turnOverGoal)}) + "<br>" +
+                    this.app.formatMessage('Turnover Recorded: { recorded }', {recorded: Ext.util.Format.money(data.clearedAmount || 0)}),
                 percent: Math.round(100 * (data.clearedAmount || 0) / data.turnOverGoal)
             }));
         }

diff --git a/tine20/Timetracker/translations/de.po b/tine20/Timetracker/translations/de.po
@@ -252,9 +252,21 @@ msgstr "Umsatz:"
 msgid "Working Time Statistics"
 msgstr "Arbeitszeit Statistik"
 
+msgid "Working Time Target: { target }"
+msgstr "Arbeitszeit Ziel: { target }"
+
+msgid "Working Time Recorded: { recorded }"
+msgstr "Erfasste Arbeitszeit: { recorded }"
+
 msgid "Turnover Statistics"
 msgstr "Umsatz Statistik"
 
+msgid "Turnover Target: { target }"
+msgstr "Umsatzziel: { target }"
+
+msgid "Turnover Recorded: { recorded }"
+msgstr "Erfasster Umsatz: { recorded }"
+
 msgid "timeframe"
 msgstr "Zeitrahmen"
 

diff --git a/tine20/Timetracker/translations/en.po b/tine20/Timetracker/translations/en.po
@@ -5,7 +5,6 @@ msgstr ""
 "PO-Revision-Date: 2008-07-29 21:14+0100\n"
 "Last-Translator: Cornelius Weiss <[email protected]>\n"
 "Language-Team: Tine 2.0 Translators\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -240,9 +239,21 @@ msgstr "Turnover:"
 msgid "Working Time Statistics"
 msgstr "Working Time Statistics"
 
+msgid "Working Time Target: { target }"
+msgstr "Working Time Target: { target }"
+
+msgid "Working Time Recorded: { recorded }"
+msgstr "Working Time Recorded: { recorded }"
+
 msgid "Turnover Statistics"
 msgstr "Turnover Statistics"
 
+msgid "Turnover Target: { target }"
+msgstr "Turnover Target: { target }"
+
+msgid "Turnover Recorded: { recorded }"
+msgstr "Turnover Recorded: { recorded }"
+
 msgid "timeframe"
 msgstr "timeframe"
 

diff --git a/tine20/Timetracker/translations/template.pot b/tine20/Timetracker/translations/template.pot
@@ -239,9 +239,21 @@ msgstr ""
 msgid "Working Time Statistics"
 msgstr ""
 
+msgid "Working Time Target: { target }"
+msgstr ""
+
+msgid "Working Time Recorded: { recorded }"
+msgstr ""
+
 msgid "Turnover Statistics"
 msgstr ""
 
+msgid "Turnover Target: { target }"
+msgstr ""
+
+msgid "Turnover Recorded: { recorded }"
+msgstr ""
+
 msgid "timeframe"
 msgstr ""
 

diff --git a/tine20/Tinebase/js/common.js b/tine20/Tinebase/js/common.js
@@ -432,8 +432,8 @@ const common = {
         if (! format || ! Ext.isString(format)) {
             const isGridCell = isObject(format) && format.hasOwnProperty('cellAttr');
             const mediumRenderer = (i, H) => {
-                const minutes = i> 0 ? String.format(i18n.ngettext(`{0} minute`, `{0} minutes`, i), i) : '';
-                const hours = H > 0 ? String.format(i18n.ngettext(`{0} hour`, `{0} hours`, H), H) : '';
+                const minutes = i> 0 ? String.format(i18n.ngettext('{0} minute', '{0} minutes', i), i) : '';
+                const hours = H > 0 ? String.format(i18n.ngettext('{0} hour', '{0} hours', H), H) : '';
                 const duration = hours && minutes ? `${hours}, ${minutes}` : hours || minutes;
                 return `<span class="duration-renderer-medium">${duration}</span>`;
             }

diff --git a/tine20/Tinebase/translations/de.po b/tine20/Tinebase/translations/de.po
@@ -505,6 +505,12 @@ msgstr "URI eines sentry services im folgenden Format: https://<key>:<secret>@my
 msgid "Sentry Loglevel Bitmask"
 msgstr "Sentra Loglevel Bitmaske"
 
+msgid "Sentry Environment"
+msgstr ""
+
+msgid "One of: AUTODETECT, PRODUCTION, TEST, DEVELOPMENT"
+msgstr ""
+
 msgid "API key to access status URI"
 msgstr "API Schlüssel für den Status Info URI Zugriff"
 
@@ -1413,6 +1419,18 @@ msgstr "Keine Information"
 msgid "No Access"
 msgstr "Kein Zugriff"
 
+#, python-brace-format
+msgid "{0} minute"
+msgid_plural "{0} minutes"
+msgstr[0] "{0} Minute"
+msgstr[1] "{0} Minuten"
+
+#, python-brace-format
+msgid "{0} hour"
+msgid_plural "{0} hours"
+msgstr[0] "{0} Stunde"
+msgstr[1] "{0} Stunden"
+
 #, python-brace-format
 msgid "{0} second"
 msgid_plural "{0} seconds"

diff --git a/tine20/Tinebase/translations/en.po b/tine20/Tinebase/translations/en.po
@@ -5,7 +5,6 @@ msgstr ""
 "PO-Revision-Date: 2008-07-29 21:14+0100\n"
 "Last-Translator: Cornelius Weiss <[email protected]>\n"
 "Language-Team: Tine 2.0 Translators\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -489,6 +488,12 @@ msgstr "URI of the sentry service in the following format: https://<key>:<secret
 msgid "Sentry Loglevel Bitmask"
 msgstr "Sentry Loglevel Bitmask"
 
+msgid "Sentry Environment"
+msgstr "Sentry Environment"
+
+msgid "One of: AUTODETECT, PRODUCTION, TEST, DEVELOPMENT"
+msgstr "One of: AUTODETECT, PRODUCTION, TEST, DEVELOPMENT"
+
 msgid "API key to access status URI"
 msgstr "API key to access status URI"
 
@@ -1397,6 +1402,18 @@ msgstr "No Information"
 msgid "No Access"
 msgstr "No Access"
 
+#, python-brace-format
+msgid "{0} minute"
+msgid_plural "{0} minutes"
+msgstr[0] "{0} minute"
+msgstr[1] "{0} minutes"
+
+#, python-brace-format
+msgid "{0} hour"
+msgid_plural "{0} hours"
+msgstr[0] "{0} hour"
+msgstr[1] "{0} hours"
+
 #, python-brace-format
 msgid "{0} second"
 msgid_plural "{0} seconds"

diff --git a/tine20/Tinebase/translations/template.pot b/tine20/Tinebase/translations/template.pot
@@ -488,6 +488,12 @@ msgstr ""
 msgid "Sentry Loglevel Bitmask"
 msgstr ""
 
+msgid "Sentry Environment"
+msgstr ""
+
+msgid "One of: AUTODETECT, PRODUCTION, TEST, DEVELOPMENT"
+msgstr ""
+
 msgid "API key to access status URI"
 msgstr ""
 
@@ -1396,6 +1402,18 @@ msgstr ""
 msgid "No Access"
 msgstr ""
 
+#, python-brace-format
+msgid "{0} minute"
+msgid_plural "{0} minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#, python-brace-format
+msgid "{0} hour"
+msgid_plural "{0} hours"
+msgstr[0] ""
+msgstr[1] ""
+
 #, python-brace-format
 msgid "{0} second"
 msgid_plural "{0} seconds"