Placeholder / merge translations

api/lang/egw_de.lang

@@ -274,6 +274,7 @@ choose a background style.	common	de	Wählen Sie einen Hintergrundstil.
 choose a text color for the icons	common	de	Wählen Sie eine Textfarbe für die Symbole
 choose file...	common	de	Dateien wählen...
 choose the category	common	de	Kategorie auswählen
+choose the default filename for merged documents.	preferences	de	Wählen Sie den Standard-Dateinamen für zusammengeführte Platzhalter-Dokumente.
 choose the parent category	common	de	Wählen der übergeordneten Kategorie
 choose time	common	de	Uhrzeit auswählen
 chosen parent category no longer exists	common	de	Die ausgewählte Elternkategorie existiert nicht (mehr).
@@ -378,6 +379,7 @@ december	common	de	Dezember
 deck	common	de	Deck (intern)
 default	common	de	Vorgabe
 default category	common	de	Standard-Kategorie
+default document to insert entries	preferences	de	Standarddokument für Einfügen in Dokument
 default height for the windows	common	de	Vorgabewert für Höhe des Fensters
 default visible actions	common	de	standardmäßig sichtbare Aktionen
 default width for the windows	common	de	Vorgabewert für Breite des Fensters
@@ -417,6 +419,8 @@ diable the execution a bugfixscript for internet explorer 5.5 and higher to show
 direction left to right	common	de	Richtung von links nach rechts
 directory	common	de	Verzeichnis
 directory does not exist, is not readable by the webserver or is not relative to the document root!	common	de	Verzeichnis existiert nicht, ist nicht vom Webserver lesbar oder ist nicht entsprechend zur Dokumentroot!
+directory for storing merged documents	preferences	de	Verzeichnis für zusammengeführte Platzhalter-Dokumente
+directory with documents to insert entries	preferences	de	Vorlagen-Verzeichnis für Einfügen in Dokument
 disable internet explorer png-image-bugfix	common	de	Internet Explorer PNG-Bilder-Bugfix abschalten
 disable slider effects	common	de	Schwebeeffekte des Navigationsmenüs abschalten
 disable the animated slider effects when showing or hiding menus in the page? opera and konqueror users will probably must want this.	common	de	Die animierten Schwebeeffekte beim Anzeigen oder Verstecken des Navigationsmenüs in der Seite abschalten? Benutzer von Opera oder Konquerer müssen diese Funktion abschalten.
@@ -1500,6 +1504,7 @@ western sahara	common	de	WEST SAHARA
 what color should all the blank space on the desktop have	common	de	Welche Farbe soll der freie Platz auf der Arbeitsfläche haben
 what happens with overflowing content: visible (default), hidden, scroll, auto (browser decides)	common	de	was passiert mit überbreitem Inhalt: sichtbar (standard), versteckt, rollend, automatisch (der Browser entscheidet)
 what style would you like the image to have?	common	de	Welchen Stil soll das Bild haben?
+when you merge entries into documents, they will be stored here. If no directory is provided, they will be stored in your home directory (%1)	preferences	de	Wenn Sie Einträge mit Platzhalter-Dokumenten zusammenführen, werden diese hier gespeichert. Wenn Sie kein Verzeichnis angeben, werden diese in Ihrem Homeverzeichnis gespeichert (%1)
 when you say yes the home and logout buttons are presented as applications in the main top applcation bar.	common	de	Wenn Sie dies aktivieren,  werden die Start und Abmelde Symbole als Anwendungen im oberen Anwendungsbalken angezeigt.
 where and how will the egroupware links like preferences, about and logout be displayed.	common	de	Wo und wie werden die EGroupware Verknüpfungen wie Einstellungen, Über ..., und Abmelden angezeigt.
 which groups	common	de	Welche Gruppen

api/lang/egw_en.lang

@@ -274,6 +274,7 @@ choose a background style.	common	en	Choose a background style
 choose a text color for the icons	common	en	Choose a text color for the icons
 choose file...	common	en	Choose file...
 choose the category	common	en	Choose the category
+choose the default filename for merged documents.	preferences	en	Choose the default filename for merged documents.
 choose the parent category	common	en	Choose the parent category
 choose time	common	en	Choose Time
 chosen parent category no longer exists	common	en	Chosen parent category no longer exists
@@ -378,6 +379,7 @@ december	common	en	December
 deck	common	en	Deck (internal)
 default	common	en	Default
 default category	common	en	Default category
+default document to insert entries	preferences	en	Default document to insert entries
 default height for the windows	common	en	Default height for the windows
 default visible actions	common	en	Default visible actions
 default width for the windows	common	en	Default width for the windows
@@ -417,6 +419,8 @@ diable the execution a bugfixscript for internet explorer 5.5 and higher to show
 direction left to right	common	en	Direction left to right
 directory	common	en	Directory
 directory does not exist, is not readable by the webserver or is not relative to the document root!	common	en	Directory does not exist, is not readable by the web server or is not relative to the document root!
+directory for storing merged documents	preferences	en	Directory for storing merged documents
+directory with documents to insert entries	preferences	en	Directory with documents to insert entries
 disable internet explorer png-image-bugfix	common	en	Disable Internet Explorer png image bugfix
 disable slider effects	common	en	Disable slider effects
 disable the animated slider effects when showing or hiding menus in the page? opera and konqueror users will probably must want this.	common	en	Disable the animated slider effects when showing or hiding menus in the page.
@@ -857,6 +861,7 @@ maybe	common	en	Maybe
 mayotte	common	en	MAYOTTE
 medium	common	en	Medium
 menu	common	en	Menu
+merged document filename	preferences	en	Merged document filename
 message	common	en	Message
 message ...	common	en	Message ...
 message prepared for sending.	common	en	Message prepared for sending.
@@ -1501,6 +1506,7 @@ western sahara	common	en	WESTERN SAHARA
 what color should all the blank space on the desktop have	common	en	What color should all the blank space on the desktop have?
 what happens with overflowing content: visible (default), hidden, scroll, auto (browser decides)	common	en	What happens with overflowing content: visible (default), hidden, scroll, auto (browser decides)
 what style would you like the image to have?	common	en	Image style
+when you merge entries into documents, they will be stored here. If no directory is provided, they will be stored in your home directory (%1)	preferences	en	When you merge entries into documents, they will be stored here.  If no directory is provided, they will be stored in your home directory (%1)
 when you say yes the home and logout buttons are presented as applications in the main top applcation bar.	common	en	If you say yes, the Home and Log out buttons are presented as applications in the main top application bar.
 where and how will the egroupware links like preferences, about and logout be displayed.	common	en	Where and how will the EGroupware links like Preferences, About and Log out be displayed.
 which groups	common	en	Which groups

api/src/Storage/Merge.php

@@ -3153,13 +3153,30 @@ abstract class Merge
 	public function merge_preferences()
 	{
 		$settings = array();
+
+		switch($this->get_app())
+		{
+			case 'addressbook':
+				// lang() will mangle the %5C encoded \ in api.EGroupware\\Api\\Contacts\\Merge.show_replacements
+				$pref_list_link = Api\Html::a_href('', Api\Framework::link('/index.php', [
+					'menuaction' => 'addressbook.addressbook_merge.show_replacements'
+				],                                                         $this->get_app())
+				);
+				break;
+			default:
+				$pref_list_link = Api\Html::a_href('', Api\Framework::link('/index.php', [
+					'menuaction' => $this->get_app() . '.' . get_class($this) . '.show_replacements'
+				],                                                         $this->get_app())
+				);
+		}
+		$pref_list_link = str_replace('</a>', '', $pref_list_link);
 		$settings[self::PREF_DEFAULT_TEMPLATE] = array(
 			'type'     => 'vfs_file',
 			'size'     => 60,
 			'label'    => 'Default document to insert entries',
 			'name'     => self::PREF_DEFAULT_TEMPLATE,
 			'help'     => lang('If you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the data inserted.', lang($this->get_app())) . ' ' .
-				lang('The document can contain placeholder like {{%1}}, to be replaced with the data.', 'name') . ' ' .
+				lang('the document can contain placeholder like {{%3}}, to be replaced with the data (%1full list of placeholder names%2).', $pref_list_link, '</a>', 'name') . ' <br/>' .
 				lang('The following document-types are supported:') . implode(',', self::get_file_extensions()),
 			'run_lang' => false,
 			'xmlrpc'   => True,
@@ -3170,8 +3187,8 @@ abstract class Merge
 			'size'     => 60,
 			'label'    => 'Directory with documents to insert entries',
 			'name'     => self::PREF_TEMPLATE_DIR,
-			'help'     => lang('If you specify a directory (full vfs path) here, %1 displays an action for each document. That action allows to download the specified document with the %1 data inserted.', lang($this->get_app())) . ' ' .
-				lang('The document can contain placeholder like {{%1}}, to be replaced with the data.', 'name') . ' ' .
+			'help'     => lang('if you specify a directory (full vfs path) here, %1 displays an action for each document. that action allows to download the specified document with the data inserted.', lang($this->get_app())) . ' ' .
+				lang('the document can contain placeholder like {{%3}}, to be replaced with the data (%1full list of placeholder names%2).', $pref_list_link, '</a>', 'name') . ' <br/>' .
 				lang('The following document-types are supported:') . implode(',', self::get_file_extensions()),
 			'run_lang' => false,
 			'xmlrpc'   => True,