From 943609a009786fde652bf8350d6db825637281e3 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 9 Apr 2020 10:50:54 +0200 Subject: [PATCH] unify video conference actions and translations --- addressbook/inc/class.addressbook_ui.inc.php | 4 ++-- addressbook/lang/egw_de.lang | 3 +-- addressbook/lang/egw_en.lang | 3 +-- addressbook/lang/egw_et.lang | 0 addressbook/lang/egw_iw.lang | 0 addressbook/lang/egw_pl.lang | 0 calendar/inc/class.calendar_boupdate.inc.php | 2 +- calendar/inc/class.calendar_uilist.inc.php | 2 +- calendar/lang/egw_de.lang | 1 - calendar/lang/egw_en.lang | 1 - calendar/lang/egw_iw.lang | 0 calendar/lang/egw_pl.lang | 0 calendar/templates/default/edit.xet | 2 +- 13 files changed, 7 insertions(+), 11 deletions(-) mode change 100755 => 100644 addressbook/lang/egw_et.lang mode change 100755 => 100644 addressbook/lang/egw_iw.lang mode change 100755 => 100644 addressbook/lang/egw_pl.lang mode change 100755 => 100644 calendar/lang/egw_iw.lang mode change 100755 => 100644 calendar/lang/egw_pl.lang diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php index 393e8d3a7d..5d970bfe19 100644 --- a/addressbook/inc/class.addressbook_ui.inc.php +++ b/addressbook/inc/class.addressbook_ui.inc.php @@ -586,14 +586,14 @@ class addressbook_ui extends addressbook_bo 'group' => $group, 'children' => [ 'call' => [ - 'caption' => lang('Call'), + 'caption' => lang('Video Call'), 'icon' => 'status/videoconference_call', 'allowOnMultiple' => true, 'onExecute' => 'javaScript:app.addressbook.videoconference_actionCall', 'enabled' => 'javaScript:app.addressbook.videoconference_isUserOnline' ], 'schedule_call' => [ - 'caption' => lang('Schedule a call'), + 'caption' => lang('Schedule a video conference'), 'icon' => 'calendar', 'allowOnMultiple' => true, 'onExecute' => 'javaScript:app.addressbook.add_cal', diff --git a/addressbook/lang/egw_de.lang b/addressbook/lang/egw_de.lang index 0aa2161fd3..5fe1a8723b 100644 --- a/addressbook/lang/egw_de.lang +++ b/addressbook/lang/egw_de.lang @@ -96,7 +96,6 @@ business zip code addressbook de PLZ geschäftlich calendar fields: addressbook de Kalender Felder: calendar integration addressbook de Kalender Integration calendar uri addressbook de Kalender URI -call addressbook de Videokonferenz can be changed via setup >> configuration admin de Kann über Setup >> Konfiguration geändert werden can't create dn %1 addressbook de dn %1 kann nicht erstellt werden car phone addressbook de Autotelefon @@ -433,7 +432,7 @@ replacements for inserting contacts into documents addressbook de Platzhalter f required fields * addressbook de unbedingt auszufüllende Felder * role addressbook de Beruf room addressbook de Raum -schedule a call addressbook de Videokonferenz planen +schedule a video conference addressbook de Videokonferenz planen search letter addressbook de Suche nach Buchstaben select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook de Wählen Sie ein hochformatiges jpeg Foto. Es wird 60 Pixel breit skaliert. select a source address to be used in geolocation routing system addressbook de Legen Sie fest, wie der Startpunkt für die Routenplanung gesetzt wird. diff --git a/addressbook/lang/egw_en.lang b/addressbook/lang/egw_en.lang index 046d7d9697..a85eaaf1e5 100644 --- a/addressbook/lang/egw_en.lang +++ b/addressbook/lang/egw_en.lang @@ -96,7 +96,6 @@ business zip code addressbook en Business postal code calendar fields: addressbook en Calendar fields: calendar integration addressbook en Calendar integration calendar uri addressbook en Calendar URI -call addressbook en Call can be changed via setup >> configuration admin en Can be changed via Setup >> Configuration can't create dn %1 addressbook en Can't create dn %1 car phone addressbook en Car phone @@ -433,7 +432,7 @@ replacements for inserting contacts into documents addressbook en Replacements f required fields * addressbook en Required fields * role addressbook en Occupation room addressbook en Room -schedule a call addressbook en Schedule a call +schedule a video conference addressbook en Schedule a video conference search letter addressbook en Search letter select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook en Select a portrait format jpeg photo. It will be re-sized to 60 pixel width. select a source address to be used in geolocation routing system addressbook en Select a source address to be used in GeoLocation routing system diff --git a/addressbook/lang/egw_et.lang b/addressbook/lang/egw_et.lang old mode 100755 new mode 100644 diff --git a/addressbook/lang/egw_iw.lang b/addressbook/lang/egw_iw.lang old mode 100755 new mode 100644 diff --git a/addressbook/lang/egw_pl.lang b/addressbook/lang/egw_pl.lang old mode 100755 new mode 100644 diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php index d3661836fb..4eb8c942ef 100644 --- a/calendar/inc/class.calendar_boupdate.inc.php +++ b/calendar/inc/class.calendar_boupdate.inc.php @@ -1064,7 +1064,7 @@ class calendar_boupdate extends calendar_bo 'account_id' => $userid ]); $event_arr['videoconference'] = [ - 'field' => lang('Videoconference'), + 'field' => lang('Video Conference'), 'data' => $details['videoconference'], ]; // hack to add videoconference-url to ical, only if description was NOT cleared diff --git a/calendar/inc/class.calendar_uilist.inc.php b/calendar/inc/class.calendar_uilist.inc.php index 0ddfd19937..888d3467ed 100644 --- a/calendar/inc/class.calendar_uilist.inc.php +++ b/calendar/inc/class.calendar_uilist.inc.php @@ -953,7 +953,7 @@ class calendar_uilist extends calendar_ui { $actions['videoconference'] = [ 'icon' => 'status/videoconference', - 'caption' => 'Video conference', + 'caption' => 'Video Conference', 'group' => $group, 'allowOnMultiple' => false, 'disableClass' => 'rowNoView', diff --git a/calendar/lang/egw_de.lang b/calendar/lang/egw_de.lang index 3e8b346f69..7eb14d932a 100644 --- a/calendar/lang/egw_de.lang +++ b/calendar/lang/egw_de.lang @@ -627,7 +627,6 @@ user selectable css file for the calendar setup calendar de Benutzer können aus users + groups: inviting both always requires an invite grant admin de Benutzer + Gruppen: Einladungen beider brauchen eine Freigabe using already existing event on server. calendar de Benutze bereits existierenden Termin auf dem Server utilities calendar de Zubehör -videoconference calendar de Videokonferenz view exception calendar de Ausnahme anzeigen view series calendar de Terminserie anzeigen view settings calendar de Einträge anzeigen diff --git a/calendar/lang/egw_en.lang b/calendar/lang/egw_en.lang index a0b0fbee2e..689116a6ab 100644 --- a/calendar/lang/egw_en.lang +++ b/calendar/lang/egw_en.lang @@ -627,7 +627,6 @@ user selectable css file for the calendar setup calendar en User selectable CSS users + groups: inviting both always requires an invite grant admin en Users + groups: inviting both always requires an invite grant using already existing event on server. calendar en Using already existing event on server. utilities calendar en Utilities -videoconference calendar en Videoconference view exception calendar en View exception view series calendar en View series view settings calendar en View settings diff --git a/calendar/lang/egw_iw.lang b/calendar/lang/egw_iw.lang old mode 100755 new mode 100644 diff --git a/calendar/lang/egw_pl.lang b/calendar/lang/egw_pl.lang old mode 100755 new mode 100644 diff --git a/calendar/templates/default/edit.xet b/calendar/templates/default/edit.xet index 64fc6d8127..b14a5da593 100644 --- a/calendar/templates/default/edit.xet +++ b/calendar/templates/default/edit.xet @@ -231,7 +231,7 @@