Skip to content

Commit 766488f

Browse files
pschuelepschuele
committed
Merge branch 'pu/ng/translations' into 'main'
tine text corrections 1 See merge request tine20/tine20!7036
2 parents fb20151 + f266273 commit 766488f

File tree

140 files changed

+2063
-2268
lines changed

Some content is hidden

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

140 files changed

+2063
-2268
lines changed

‎tests/e2etests/src/testScreenshots/Admin/admin.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,13 +181,13 @@ describe('shared tags', () => {
181181
});
182182
});
183183

184-
describe('customfields', () => {
184+
describe('custom fields', () => {
185185
test('mainpage', async () => {
186186
await expect(page).toClick('.t-app-admin .tine-mainscreen-centerpanel-west span', {text: 'Zusatzfelder'});
187187
await page.waitForTimeout(1000);
188188
await page.screenshot({path: 'screenshots/Administration/27_admin_zusatzfelder.png'});
189189
});
190-
test('edit customfields', async () => {
190+
test('edit custom fields', async () => {
191191
let cfDialog = lib.getNewWindow();
192192
await expect(page).toClick('.t-app-admin button', {text: 'Zusatzfeld hinzufügen'});
193193
cfDialog = await cfDialog;

‎tests/e2etests/src/testScreenshots/Calendar/calendar.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ describe('MainScreen', () => {
5454
});
5555

5656
test('add attendee', async () => {
57-
await expect(page).toClick('.x-grid3-cell-inner.x-grid3-col-user_id', {text: 'Teilnehmer*in hinzufügen'});
57+
await expect(page).toClick('.x-grid3-cell-inner.x-grid3-col-user_id', {text: 'Teilnehmende hinzufügen'});
5858
await page.waitForTimeout(1000);
5959
await page.click('.x-trigger-wrap-focus span');
6060
await page.waitForTimeout(500);

‎tests/tine20/Admin/Frontend/Json/QuotaTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ public function testSaveQuotaEmailPersonal()
186186
self::fail('should throw Tinebase_Exception_UnexpectedValue');
187187
} catch (Tinebase_Exception_UnexpectedValue $e) {
188188
$translate = Tinebase_Translation::getTranslation('Admin');
189-
self::assertEquals($translate->_("Account E-Mail needs to be set!"), $e->getMessage());
189+
self::assertEquals($translate->_("Account email needs to be set!"), $e->getMessage());
190190
}
191191

192192
try {
@@ -196,7 +196,7 @@ public function testSaveQuotaEmailPersonal()
196196
self::fail('should throw Tinebase_Exception_UnexpectedValue');
197197
} catch (Tinebase_Exception_UnexpectedValue $e) {
198198
$translate = Tinebase_Translation::getTranslation('Admin');
199-
self::assertEquals($translate->_("E-Mail account not found."), $e->getMessage());
199+
self::assertEquals($translate->_("Email account not found."), $e->getMessage());
200200
}
201201

202202
// save without account manage right

‎tests/tine20/Calendar/Controller/EventNotificationsTests.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ public function testRecuringExceptions()
508508

509509
self::flushMailer();
510510
$persistentEvent = $this->_eventController->create($event);
511-
$this->_assertMail('jmcblack', 'Recurrance rule: Daily', 'body');
511+
$this->_assertMail('jmcblack', 'Recurrence Rule: Daily', 'body');
512512

513513
$exceptions = new Tinebase_Record_RecordSet('Calendar_Model_Event');
514514
$recurSet = Calendar_Model_Rrule::computeRecurrenceSet($persistentEvent, $exceptions, $from, $until);
@@ -592,7 +592,7 @@ public function testAttendeeAlarmSkip()
592592
self::flushMailer();
593593

594594
Tinebase_Alarm::getInstance()->sendPendingAlarms("Tinebase_Event_Async_Minutely");
595-
$this->_assertMail('sclever', 'Alarm for event');
595+
$this->_assertMail('sclever', 'Alarm for the event');
596596
$this->_assertMail('pwulf');
597597
}
598598

@@ -620,7 +620,7 @@ public function testAttendeeAlarmOnly()
620620
self::flushMailer();
621621

622622
Tinebase_Alarm::getInstance()->sendPendingAlarms("Tinebase_Event_Async_Minutely");
623-
$this->_assertMail('pwulf', 'Alarm for event');
623+
$this->_assertMail('pwulf', 'Alarm for the event');
624624
$this->_assertMail('sclever');
625625

626626
}

‎tests/tine20/Calendar/Controller/PollTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ public function testPublicApiAddAttenderNotification()
610610
$confirmationMessage = $messages[0];
611611
$this->assertEquals('[email protected]', $confirmationMessage->getRecipients()[0]);
612612
$text = $confirmationMessage->getBodyText()->getContent();
613-
$this->assertStringContainsString('Thank you for attendening', $text);
613+
$this->assertStringContainsString('Thank you for attending', $text);
614614
$this->assertStringNotContainsString('Array', $text, 'notification did not cope with resolved stuff');
615615

616616
} finally {

‎tests/tine20/Calendar/JsonTests.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1698,7 +1698,7 @@ public function testSaveResourcesWithoutRights()
16981698

16991699
static::expectException(Tinebase_Exception_AccessDenied::class); $this->expectExceptionMessageMatches('/No Permission./');
17001700
$this->testSaveResource(array(Calendar_Model_ResourceGrants::RESOURCE_ADMIN => true));
1701-
static::expectException(Calendar_Exception_ResourceAdminGrant::class); $this->expectExceptionMessageMatches('/The right Resource Admin must be set once./');
1701+
static::expectException(Calendar_Exception_ResourceAdminGrant::class); $this->expectExceptionMessageMatches('/The correct Resource Admin must be set once./');
17021702
$this->testSaveResource(array());
17031703
}
17041704

@@ -1724,7 +1724,7 @@ public function testSearchResources()
17241724
}
17251725

17261726
/**
1727-
* assert add attendee does not work for non readable resources
1727+
* assert add attendee does not work for none readable resources
17281728
*/
17291729
public function testResourceAttendeeAddFail()
17301730
{

‎tests/tine20/Crm/ControllerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ public function testUpdateReadonlyLead()
315315
// try to save the Lead again
316316
$translation = Tinebase_Translation::getTranslation('Crm');
317317
$this->expectException('Tinebase_Exception_SystemGeneric');
318-
$this->expectExceptionMessage($translation->_('This Lead state is set to read-only therefore updating this Lead is not possible.'));
318+
$this->expectExceptionMessage($translation->_('This lead state is set to read-only. Therefore, updating this lead is not possible.'));
319319
Crm_Controller_Lead::getInstance()->update($updatedLead);
320320
}
321321

‎tests/tine20/EFile/EFileNodeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ public function testRenameDeniedSubstrings()
318318

319319
static::expectException(Tinebase_Exception_SystemGeneric::class);
320320
$translation = Tinebase_Translation::getTranslation('EFile');
321-
static::expectExceptionMessage($translation->_('EFile node names may not contain:') . ' ' . '#');
321+
static::expectExceptionMessage($translation->_('eFile node names may not contain:') . ' ' . '#');
322322
$fs->rename($nodePath, $newNodePath);
323323
}
324324

‎tine20/Addressbook/Frontend/Cli.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,10 +243,10 @@ public function removeAutogeneratedContacts($opts)
243243
$locale = new Zend_Locale($language);
244244

245245
$translation = Tinebase_Translation::getTranslation('Calendar', $locale);
246-
// search all contacts with note "This contact has been automatically added by the system as an event attender"
246+
// search all contacts with note "This contact was automatically added by the system as an event attendee."
247247
$noteFilter = new Addressbook_Model_ContactFilter(array(
248248
array('field' => 'note', 'operator' => 'equals', 'value' =>
249-
$translation->_('This contact has been automatically added by the system as an event attender')),
249+
$translation->_('This contact was automatically added by the system as an event attendee.')),
250250
));
251251
$contactIdsToDelete = $contactBackend->search($noteFilter, null, Tinebase_Backend_Sql_Abstract::IDCOL);
252252

‎tine20/Addressbook/js/Printer/ListRecord.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Tine.Addressbook.Printer.ListRenderer = Ext.extend(Ext.ux.Printer.EditDialogRend
5252

5353
customFields = Tine.widgets.customfields.Renderer.renderAll('Addressbook', Tine.Addressbook.Model.List, values);
5454
if(customFields) {
55-
return '<div class="rp-print-single-block-heading">' + i18n._('Customfields') + '</div>' + customFields + '</br>';
55+
return '<div class="rp-print-single-block-heading">' + i18n._('Custom Fields') + '</div>' + customFields + '</br>';
5656
}
5757
},
5858
fieldRenderer: function (fieldValue, label) {

‎tine20/Addressbook/translations/de.po

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,15 @@ msgstr "Kriterium zum ausblenden von Kontakten"
124124
msgid "The contact is hidden if it is ... (one of: disabled, expired or never)"
125125
msgstr "Der Kontakt wird ausgeblendet wenn er ... ist. (eines von: deaktiviert, abgelaufen oder niemals)"
126126

127+
msgid "Contact Property Link Types"
128+
msgstr ""
129+
130+
msgid "Inline"
131+
msgstr ""
132+
133+
msgid "Records"
134+
msgstr ""
135+
127136
msgid "Contact types available"
128137
msgstr "Verfügbare Kontkakt-Typen"
129138

@@ -217,7 +226,7 @@ msgstr "Die E-Mail-Adresse ist bereits vergeben. Bitte wählen Sie eine andere."
217226
msgid "Maximum number of role members reached"
218227
msgstr "Maximale Anzahl von Mitgliedern erreicht"
219228

220-
#, python-format
229+
#, python-format, php-format
221230
msgid "%s's personal addressbook"
222231
msgstr "%ss persönliches Adressbuch"
223232

@@ -688,9 +697,6 @@ msgid_plural "Email Addresses"
688697
msgstr[0] "E-mail Adresse"
689698
msgstr[1] "E-mail Adressen"
690699

691-
msgid "GENDER_Email Address"
692-
msgstr "female"
693-
694700
msgid "Email Addresses"
695701
msgstr "E-mail Adressen"
696702

@@ -717,7 +723,7 @@ msgstr "Private Anschrift"
717723
msgid "Related to"
718724
msgstr "Verknüpft mit"
719725

720-
msgid "Customfields"
726+
msgid "Custom Fields"
721727
msgstr "Zusatzfelder"
722728

723729
msgid "System Group"
@@ -1012,3 +1018,12 @@ msgid "Relation"
10121018
msgid_plural "Relations"
10131019
msgstr[0] "Verknüpfung"
10141020
msgstr[1] "Verknüpfungen"
1021+
1022+
msgid "Display Name (email)"
1023+
msgstr ""
1024+
1025+
msgid "Display Name - Company / Organisation"
1026+
msgstr ""
1027+
1028+
msgid "Salutation Title Last Name (Company / Organisation)"
1029+
msgstr ""

‎tine20/Addressbook/translations/en.po

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,15 @@ msgstr "Contact Hidden Criteria"
112112
msgid "The contact is hidden if it is ... (one of: disabled, expired or never)"
113113
msgstr "The contact is hidden if it is ... (one of: disabled, expired or never)"
114114

115+
msgid "Contact Property Link Types"
116+
msgstr "Contact Property Link Types"
117+
118+
msgid "Inline"
119+
msgstr "Inline"
120+
121+
msgid "Records"
122+
msgstr "Records"
123+
115124
msgid "Contact types available"
116125
msgstr "Contact types available"
117126

@@ -205,7 +214,7 @@ msgstr "E-Mail address is already given. Please choose another one."
205214
msgid "Maximum number of role members reached"
206215
msgstr "Maximum number of role members reached"
207216

208-
#, python-format
217+
#, python-format, php-format
209218
msgid "%s's personal addressbook"
210219
msgstr "%s's personal addressbook"
211220

@@ -414,6 +423,9 @@ msgstr "Unit"
414423
msgid "Sites"
415424
msgstr "Sites"
416425

426+
msgid "Search for sites ... (leave empty for all sites)"
427+
msgstr "Search for sites ... (leave empty for all sites)"
428+
417429
msgid "Color"
418430
msgstr "Color"
419431

@@ -699,8 +711,8 @@ msgstr "Private Address"
699711
msgid "Related to"
700712
msgstr "Related to"
701713

702-
msgid "Customfields"
703-
msgstr "Customfields"
714+
msgid "Custom Fields"
715+
msgstr "Custom Fields"
704716

705717
msgid "System Group"
706718
msgstr "System Group"
@@ -991,3 +1003,12 @@ msgid "Relation"
9911003
msgid_plural "Relations"
9921004
msgstr[0] "Relation"
9931005
msgstr[1] "Relations"
1006+
1007+
msgid "Display Name (email)"
1008+
msgstr "Display Name (email)"
1009+
1010+
msgid "Display Name - Company / Organisation"
1011+
msgstr "Display Name - Company / Organisation"
1012+
1013+
msgid "Salutation Title Last Name (Company / Organisation)"
1014+
msgstr "Salutation Title Last Name (Company / Organisation)"

‎tine20/Addressbook/translations/template.pot

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,15 @@ msgstr ""
112112
msgid "The contact is hidden if it is ... (one of: disabled, expired or never)"
113113
msgstr ""
114114

115+
msgid "Contact Property Link Types"
116+
msgstr ""
117+
118+
msgid "Inline"
119+
msgstr ""
120+
121+
msgid "Records"
122+
msgstr ""
123+
115124
msgid "Contact types available"
116125
msgstr ""
117126

@@ -205,7 +214,7 @@ msgstr ""
205214
msgid "Maximum number of role members reached"
206215
msgstr ""
207216

208-
#, python-format
217+
#, python-format, php-format
209218
msgid "%s's personal addressbook"
210219
msgstr ""
211220

@@ -414,6 +423,9 @@ msgstr ""
414423
msgid "Sites"
415424
msgstr ""
416425

426+
msgid "Search for sites ... (leave empty for all sites)"
427+
msgstr ""
428+
417429
msgid "Color"
418430
msgstr ""
419431

@@ -699,7 +711,7 @@ msgstr ""
699711
msgid "Related to"
700712
msgstr ""
701713

702-
msgid "Customfields"
714+
msgid "Custom Fields"
703715
msgstr ""
704716

705717
msgid "System Group"
@@ -991,3 +1003,12 @@ msgid "Relation"
9911003
msgid_plural "Relations"
9921004
msgstr[0] ""
9931005
msgstr[1] ""
1006+
1007+
msgid "Display Name (email)"
1008+
msgstr ""
1009+
1010+
msgid "Display Name - Company / Organisation"
1011+
msgstr ""
1012+
1013+
msgid "Salutation Title Last Name (Company / Organisation)"
1014+
msgstr ""

‎tine20/Admin/Acl/Rights.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class Admin_Acl_Rights extends Tinebase_Acl_Rights_Abstract
4545
const MANAGE_APPS = 'manage_apps';
4646

4747
/**
48-
* the right to manage e-mail accounts
48+
* the right to manage email accounts
4949
* @staticvar string
5050
*/
5151
const MANAGE_EMAILACCOUNTS = 'manage_emailaccounts';
@@ -87,7 +87,7 @@ class Admin_Acl_Rights extends Tinebase_Acl_Rights_Abstract
8787
const MANAGE_CONTAINERS = 'manage_containers';
8888

8989
/**
90-
* the right to manage customfields
90+
* the right to manage custom fields
9191
* @staticvar string
9292
*/
9393
const MANAGE_CUSTOMFIELDS = 'manage_customfields';
@@ -117,7 +117,7 @@ class Admin_Acl_Rights extends Tinebase_Acl_Rights_Abstract
117117
const VIEW_SHARED_TAGS = 'viewshared_tags';
118118

119119
/**
120-
* the right to view e-mail accounts
120+
* the right to view email accounts
121121
* @staticvar string
122122
*/
123123
const VIEW_EMAILACCOUNTS = 'view_emailaccounts';
@@ -147,7 +147,7 @@ class Admin_Acl_Rights extends Tinebase_Acl_Rights_Abstract
147147
const VIEW_CONTAINERS = 'view_containers';
148148

149149
/**
150-
* the right to customfields
150+
* the right to custom fields
151151
* @staticvar string
152152
*/
153153
const VIEW_CUSTOMFIELDS = 'view_customfields';
@@ -276,8 +276,8 @@ public static function getTranslatedRightDescriptions()
276276
'description' => $translate->_('Add and edit users and groups, add group members, change user passwords.'),
277277
),
278278
self::MANAGE_EMAILACCOUNTS => array(
279-
'text' => $translate->_('Manage e-mail accounts'),
280-
'description' => $translate->_('Add and edit shared and personal e-mail accounts.'),
279+
'text' => $translate->_('Manage email accounts'),
280+
'description' => $translate->_('Add and edit shared and personal email accounts.'),
281281
),
282282
self::MANAGE_APPS => array(
283283
'text' => $translate->_('Manage applications'),
@@ -308,8 +308,8 @@ public static function getTranslatedRightDescriptions()
308308
'description' => $translate->_('Add, delete and edit containers and manage container grants.'),
309309
),
310310
self::MANAGE_CUSTOMFIELDS => array(
311-
'text' => $translate->_('Manage customfields'),
312-
'description' => $translate->_('Add and edit customfields.'),
311+
'text' => $translate->_('Manage custom fields'),
312+
'description' => $translate->_('Add and edit custom fields.'),
313313
),
314314
self::MANAGE_IMPORTEXPORTDEFINITIONS => array(
315315
'text' => $translate->_('Manage import and export definitions'),
@@ -324,8 +324,8 @@ public static function getTranslatedRightDescriptions()
324324
'description' => $translate->_('View accounts list and details.'),
325325
),
326326
self::VIEW_EMAILACCOUNTS => array(
327-
'text' => $translate->_('View e-mail accounts'),
328-
'description' => $translate->_('View shared and personal e-mail accounts.'),
327+
'text' => $translate->_('View email accounts'),
328+
'description' => $translate->_('View shared and personal email accounts.'),
329329
),
330330
self::VIEW_APPS => array(
331331
'text' => $translate->_('View applications'),
@@ -348,12 +348,12 @@ public static function getTranslatedRightDescriptions()
348348
'description' => $translate->_('View personal and shared containers.'),
349349
),
350350
self::VIEW_CUSTOMFIELDS => array(
351-
'text' => $translate->_('View customfields'),
352-
'description' => $translate->_('View customfields list.'),
351+
'text' => $translate->_('View custom fields'),
352+
'description' => $translate->_('View custom fields list.'),
353353
),
354354
self::VIEW_SERVERINFO => array(
355-
'text' => $translate->_('View serverinfo'),
356-
'description' => $translate->_('View serverinfo list.'),
355+
'text' => $translate->_('View server info'),
356+
'description' => $translate->_('View server info list.'),
357357
),
358358
self::VIEW_QUOTA_USAGE => array(
359359
'text' => $translate->_('View quota usage'),

0 commit comments

Comments
 (0)