From db71f7660f5cc9ba39f26e8ca57c9f71e5be3fbc Mon Sep 17 00:00:00 2001 From: nathangray Date: Thu, 24 Nov 2016 10:30:36 -0700 Subject: [PATCH] Reduce translation duplication - use a single common message for entry copied --- addressbook/inc/class.addressbook_ui.inc.php | 2 +- addressbook/lang/egw_de.lang | 1 - addressbook/lang/egw_en.lang | 1 - api/lang/egw_de.lang | 1 + api/lang/egw_en.lang | 1 + calendar/inc/class.calendar_uiforms.inc.php | 2 +- calendar/lang/egw_de.lang | 1 - calendar/lang/egw_en.lang | 1 - infolog/inc/class.infolog_ui.inc.php | 2 +- infolog/lang/egw_de.lang | 1 - infolog/lang/egw_en.lang | 1 - 11 files changed, 5 insertions(+), 9 deletions(-) diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php index 9c960f3724..2c5c8951ad 100644 --- a/addressbook/inc/class.addressbook_ui.inc.php +++ b/addressbook/inc/class.addressbook_ui.inc.php @@ -2205,7 +2205,7 @@ window.egw_LAB.wait(function() { if($content && $_GET['makecp']) // copy the contact { $this->copy_contact($content); - $content['msg'] = lang('Contact copied'); + $content['msg'] = lang('%1 copied - the copy can now be edited', lang(Link::get_registry('addressbook','entry'))); $view = false; } else diff --git a/addressbook/lang/egw_de.lang b/addressbook/lang/egw_de.lang index fa26d901f6..a05d8a38b6 100644 --- a/addressbook/lang/egw_de.lang +++ b/addressbook/lang/egw_de.lang @@ -122,7 +122,6 @@ company name addressbook de Firmenname configuration common de Konfiguration contact common de Kontakt contact application admin de Kontakt Anwendung -contact copied addressbook de Kontakt kopiert contact data addressbook de Kontaktdaten contact deleted addressbook de Kontakt gelöscht contact fields to show addressbook de Kontaktfelder die angezeigt werden sollen diff --git a/addressbook/lang/egw_en.lang b/addressbook/lang/egw_en.lang index ce164d0ea2..a7ddda3d64 100644 --- a/addressbook/lang/egw_en.lang +++ b/addressbook/lang/egw_en.lang @@ -122,7 +122,6 @@ company name addressbook en Company name configuration common en Configuration contact common en Contact contact application admin en Contact application -contact copied addressbook en Contact copied. contact data addressbook en Contact data contact deleted addressbook en Contact deleted. contact fields to show addressbook en Contact fields to show diff --git a/api/lang/egw_de.lang b/api/lang/egw_de.lang index a580402b7d..ec564abfa8 100644 --- a/api/lang/egw_de.lang +++ b/api/lang/egw_de.lang @@ -1,5 +1,6 @@ %1 (%2 new) messages writen for application '%3' and languages '%4' common de %1 (%2 neue) Texte für die Anwendung '%3' und die Sprache '%4' geschrieben %1 active file(s) with same name as directory inactivated! admin de %1 aktive Dateien mit dem selben Verzeichnisnamen wurden deaktiviert! +%1 copied - the copy can now be edited common de %1 Kopie - Diese Kopie kann jetzt bearbeitet werden %1 directories %2 found! admin de %1 Verzeichnisse %2 gefunden! %1 email addresses inserted common de %1 E-Mail-Adressen eingefügt %1 entries found, select one ... common de %1 Einträge gefunden, einen auswählen ... diff --git a/api/lang/egw_en.lang b/api/lang/egw_en.lang index ab55bc65dc..87e9c8a3c6 100644 --- a/api/lang/egw_en.lang +++ b/api/lang/egw_en.lang @@ -1,5 +1,6 @@ %1 (%2 new) messages writen for application '%3' and languages '%4' common en %1 (%2 new) messages written for application '%3' and languages '%4' %1 active file(s) with same name as directory inactivated! admin en %1 active file(s) with same name as directory inactivated! +%1 copied - the copy can now be edited %1 directories %2 found! admin en %1 directories %2 found! %1 email addresses inserted common en %1 email addresses inserted. %1 entries found, select one ... common en %1 entries found, select one ... diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php index 8dcbbc081d..be3b6219d9 100644 --- a/calendar/inc/class.calendar_uiforms.inc.php +++ b/calendar/inc/class.calendar_uiforms.inc.php @@ -659,7 +659,7 @@ class calendar_uiforms extends calendar_ui } unset($link); $preserv['view'] = $preserv['edit_single'] = false; - $msg = lang('Event copied - the copy can now be edited'); + $msg = lang('%1 copied - the copy can now be edited', lang(Link::get_registry('calendar','entry'))); $event['title'] = lang('Copy of:').' '.$event['title']; break; diff --git a/calendar/lang/egw_de.lang b/calendar/lang/egw_de.lang index 6f16b73a9c..460888d9f1 100644 --- a/calendar/lang/egw_de.lang +++ b/calendar/lang/egw_de.lang @@ -197,7 +197,6 @@ error: starttime has to be before the endtime !!! calendar de Fehler: Startzeit error: the entry has been updated since you opened it for editing! calendar de Fehler: Der Eintrag wurde geändert seit Sie ihn zum Bearbeiten geöffnet haben! error: you can't shift a series from the past! calendar de Eine abgelaufene Serie kann nicht mehr verschoben werden! event common de Termin -event copied - the copy can now be edited calendar de Termin kopiert - die Kopie kann jetzt bearbeitet werden event deleted calendar de Termin gelöscht event details follow calendar de Details zum Termin folgen event saved calendar de Termin gespeichert diff --git a/calendar/lang/egw_en.lang b/calendar/lang/egw_en.lang index 991165189a..254f3f70e0 100644 --- a/calendar/lang/egw_en.lang +++ b/calendar/lang/egw_en.lang @@ -197,7 +197,6 @@ error: starttime has to be before the endtime !!! calendar en Error: Start time error: the entry has been updated since you opened it for editing! calendar en Error: The entry has been updated since you opened it for editing! error: you can't shift a series from the past! calendar en Error: You can't shift a series from the past! event common en Event -event copied - the copy can now be edited calendar en Event copied - the copy can now be edited. event deleted calendar en Event deleted. event details follow calendar en Event details follow event saved calendar en Event saved. diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php index 3d7a525879..dd12a88a1e 100644 --- a/infolog/inc/class.infolog_ui.inc.php +++ b/infolog/inc/class.infolog_ui.inc.php @@ -2379,7 +2379,7 @@ class infolog_ui } if (!$create_sub) { - $content['msg'] .= ($content['msg']?"\n":'').lang('Infolog copied - the copy can now be edited'); + $content['msg'] .= ($content['msg']?"\n":'').lang('%1 copied - the copy can now be edited', lang(Link::get_registry('infolog','entry'))); } } diff --git a/infolog/lang/egw_de.lang b/infolog/lang/egw_de.lang index be0190b0ec..2d52f7b5ab 100644 --- a/infolog/lang/egw_de.lang +++ b/infolog/lang/egw_de.lang @@ -242,7 +242,6 @@ infolog - import csv-file infolog de InfoLog - Import CSV-Datei infolog - new infolog de InfoLog - Anlegen infolog - new subproject infolog de InfoLog - Anlegen Teilprojekt infolog - subprojects from infolog de InfoLog - Teilprojekte von -infolog copied - the copy can now be edited infolog de InfoLog Kopie - Diese Kopie kann jetzt bearbeitet werden infolog csv export infolog de InfoLog CSV Export infolog csv import infolog de InfoLog CSV Import infolog entry deleted infolog de InfoLog Eintrag gelöscht diff --git a/infolog/lang/egw_en.lang b/infolog/lang/egw_en.lang index 8ef9f13966..8621a932ac 100644 --- a/infolog/lang/egw_en.lang +++ b/infolog/lang/egw_en.lang @@ -242,7 +242,6 @@ infolog - import csv-file infolog en InfoLog - Import CSV file infolog - new infolog en InfoLog - New infolog - new subproject infolog en InfoLog - New sub project infolog - subprojects from infolog en InfoLog - Sub projects from -infolog copied - the copy can now be edited infolog en InfoLog copied - the copy can now be edited infolog csv export infolog en InfoLog CSV export infolog csv import infolog en InfoLog CSV import infolog entry deleted infolog en InfoLog entry deleted