From 09f636e1ccb9d9c5e98401a3bebe70bb18399d7a Mon Sep 17 00:00:00 2001 From: "m.escher" <m.escher@adito.de> Date: Thu, 20 Dec 2018 11:22:42 +0100 Subject: [PATCH] add Translations and Uniqueflags for Dashletconfigurations --- .../_____LANGUAGE_EXTRA.aod | 57 +++++++++++ .../_____LANGUAGE_de/_____LANGUAGE_de.aod | 97 +++++++++++++++++++ .../_____LANGUAGE_en/_____LANGUAGE_en.aod | 57 +++++++++++ .../ActivityFilter_view.aod | 6 +- .../ContractFilter_view.aod | 6 +- .../FacebookTimeline_view.aod | 6 +- .../OfferFilter_view/OfferFilter_view.aod | 10 +- .../OrderFilter_view/OrderFilter_view.aod | 4 +- neonView/OrgFilter_view/OrgFilter_view.aod | 6 +- neonView/PersFilter_view/PersFilter_view.aod | 6 +- .../ProductFilter_view/ProductFilter_view.aod | 6 +- .../SalesprojectFilter_view.aod | 10 +- .../TwitterTimeline_view.aod | 8 +- .../_____PREFERENCES_PROJECT.aod | 2 +- 14 files changed, 246 insertions(+), 35 deletions(-) diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index 4883cbad14..8ab92823bc 100644 --- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod +++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod @@ -1290,6 +1290,63 @@ <entry> <key>Turnover</key> </entry> + <entry> + <key>Sent offers</key> + </entry> + <entry> + <key>Show all activities</key> + </entry> + <entry> + <key>Offers</key> + </entry> + <entry> + <key>Show all sent offers</key> + </entry> + <entry> + <key>Show my activities</key> + </entry> + <entry> + <key>Show all receipts</key> + </entry> + <entry> + <key>Receipts</key> + </entry> + <entry> + <key>My Activities</key> + </entry> + <entry> + <key>Show all offers</key> + </entry> + <entry> + <key>Show all products</key> + </entry> + <entry> + <key>Show all Facebook posts of a user</key> + </entry> + <entry> + <key>Show all tweets of a user</key> + </entry> + <entry> + <key>Show all companies</key> + </entry> + <entry> + <key>Show all tweets of ADITO</key> + </entry> + <entry> + <key>Show all sent receipts</key> + </entry> + <entry> + <key>Products</key> + </entry> + <entry> + <key>Show all Facebook posts of ADITO</key> + </entry> + <entry> + <key>Companies</key> + </entry> + <entry> + <key>Show all contacts</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> <sqlModels> diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod index 335a5805de..7226882834 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -26,6 +26,14 @@ <key>Internal</key> <value>Intern</value> </entry> + <entry> + <key>Show all activities</key> + <value>Alle Aktivitäten anzeigen</value> + </entry> + <entry> + <key>Show all contracts</key> + <value>Alle Verträge anzeigen</value> + </entry> <entry> <key>Male</key> <value>Männlich</value> @@ -205,6 +213,10 @@ <key>Gender</key> <value>Geschlecht</value> </entry> + <entry> + <key>Show all companies</key> + <value>Alle Firmen anzeigen</value> + </entry> <entry> <key>Date of birth</key> <value>Geburtsdatum</value> @@ -233,6 +245,10 @@ <key>Firstname</key> <value>Vorname</value> </entry> + <entry> + <key>Show all contacts</key> + <value>Alle Kontaktpersonen anzeigen</value> + </entry> <entry> <key>Description</key> <value>Beschreibung</value> @@ -289,6 +305,10 @@ <key>District</key> <value></value> </entry> + <entry> + <key>Companies</key> + <value>Firmen</value> + </entry> <entry> <key>Switzerland</key> <value>Schweiz</value> @@ -758,6 +778,10 @@ <key>Offer number</key> <value>Angebotsnummer</value> </entry> + <entry> + <key>Show my activities</key> + <value>Meine Aktivitäten anzeigen</value> + </entry> <entry> <key>Probability</key> <value>Wahrscheinlichkeit</value> @@ -825,6 +849,10 @@ <key>Receipt</key> <value>Beleg</value> </entry> + <entry> + <key>Show all receipts</key> + <value>Alle Belege anzeigen</value> + </entry> <entry> <key>Optional</key> <value>Optional</value> @@ -837,6 +865,10 @@ <key>Article</key> <value>Artikel</value> </entry> + <entry> + <key>Show open salesprojects</key> + <value>Offene Vertriebsprojekte anzeigen</value> + </entry> <entry> <key>Receipt number</key> <value>Belegnummer</value> @@ -858,6 +890,10 @@ <entry> <key>Option4</key> </entry> + <entry> + <key>Offers</key> + <value>Angebote</value> + </entry> <entry> <key>Option3</key> </entry> @@ -1124,6 +1160,10 @@ <key>A reason is only possible if a date is given.</key> <value>Begründung nur bei Ausgeschiedenen Mitbewerbern erlaubt.</value> </entry> + <entry> + <key>Show all products</key> + <value>Alle Produkte anzeigen</value> + </entry> <entry> <key>Role</key> </entry> @@ -1161,6 +1201,14 @@ <entry> <key>Branche 2</key> </entry> + <entry> + <key>Show all offers</key> + <value>Alle Angebote anzeigen</value> + </entry> + <entry> + <key>Products</key> + <value>Produkte</value> + </entry> <entry> <key>Branche 1</key> </entry> @@ -1195,6 +1243,10 @@ <key>Weakness</key> <value>Schwäche</value> </entry> + <entry> + <key>Show all sent receipts</key> + <value>Alle versendeten Belege anzeigen</value> + </entry> <entry> <key>Low price strategy</key> </entry> @@ -1204,19 +1256,47 @@ <entry> <key>in 6 Months</key> </entry> + <entry> + <key>Sent offers</key> + <value>Versendete Angebote</value> + </entry> <entry> <key>Budget (Project)</key> </entry> + <entry> + <key>Show all Facebook posts of a user</key> + <value>Alle Facebook Beiträge eines Benutzers anzeigen</value> + </entry> <entry> <key>Price politics</key> <value>Preispolitik</value> </entry> + <entry> + <key>My Activities</key> + <value>Meine Aktivitäten</value> + </entry> + <entry> + <key>Salesprojects</key> + <value>Vertriebsprojekte</value> + </entry> <entry> <key>to</key> </entry> + <entry> + <key>Open salesprojects</key> + <value>Offene Vertriebsprojekte</value> + </entry> <entry> <key>Other</key> </entry> + <entry> + <key>Show all sent offers</key> + <value>Alle versendeten Angebote anzeigen</value> + </entry> + <entry> + <key>Show all Facebook posts of ADITO</key> + <value>Alle Facebook Beiträge von ADITO anzeigen</value> + </entry> <entry> <key>Individual</key> </entry> @@ -1226,16 +1306,32 @@ <entry> <key>Base</key> </entry> + <entry> + <key>Receipts</key> + <value>Belege</value> + </entry> <entry> <key>Strength</key> <value>Stärke</value> </entry> + <entry> + <key>Show all salesprojects</key> + <value>Alle Vertriebsprojekte anzeigen</value> + </entry> <entry> <key>Abbomodell</key> </entry> <entry> <key>Schlüsselwort</key> </entry> + <entry> + <key>Show all tweets of ADITO</key> + <value>Alle tweets von ADITO anzeigen</value> + </entry> + <entry> + <key>Show all tweets of a user</key> + <value>Alle tweets eines Benutzers anzeigen</value> + </entry> <entry> <key>in 12 Months</key> </entry> @@ -1568,6 +1664,7 @@ </entry> <entry> <key>Sent receipts</key> + <value>Versendete Belege</value> </entry> <entry> <key>Copy receipt</key> diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod index d4b04cab65..1bff877fc6 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -1307,6 +1307,63 @@ <entry> <key>Turnover</key> </entry> + <entry> + <key>Sent offers</key> + </entry> + <entry> + <key>Show all activities</key> + </entry> + <entry> + <key>Offers</key> + </entry> + <entry> + <key>Show all sent offers</key> + </entry> + <entry> + <key>Show my activities</key> + </entry> + <entry> + <key>Show all receipts</key> + </entry> + <entry> + <key>Receipts</key> + </entry> + <entry> + <key>My Activities</key> + </entry> + <entry> + <key>Show all offers</key> + </entry> + <entry> + <key>Show all products</key> + </entry> + <entry> + <key>Show all Facebook posts of a user</key> + </entry> + <entry> + <key>Show all tweets of a user</key> + </entry> + <entry> + <key>Show all companies</key> + </entry> + <entry> + <key>Show all tweets of ADITO</key> + </entry> + <entry> + <key>Show all sent receipts</key> + </entry> + <entry> + <key>Products</key> + </entry> + <entry> + <key>Show all Facebook posts of ADITO</key> + </entry> + <entry> + <key>Companies</key> + </entry> + <entry> + <key>Show all contacts</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> diff --git a/neonView/ActivityFilter_view/ActivityFilter_view.aod b/neonView/ActivityFilter_view/ActivityFilter_view.aod index 922159d920..1646471bc2 100644 --- a/neonView/ActivityFilter_view/ActivityFilter_view.aod +++ b/neonView/ActivityFilter_view/ActivityFilter_view.aod @@ -9,7 +9,7 @@ <title>Activities</title> <description>Show all activities</description> <fragment>Activity_context/filter</fragment> - <singleton v="false" /> + <singleton v="true" /> <requiresConfiguration v="false" /> <icon>neon:history</icon> <categories> @@ -25,8 +25,8 @@ </neonDashletConfiguration> <neonDashletConfiguration> <name>InnateActivitiesDashlet</name> - <title>My histories</title> - <description>Show my histories</description> + <title>My Activities</title> + <description>Show my activities</description> <fragment>Activity_context/filter</fragment> <singleton v="true" /> <requiresConfiguration v="false" /> diff --git a/neonView/ContractFilter_view/ContractFilter_view.aod b/neonView/ContractFilter_view/ContractFilter_view.aod index 7671783e36..9233b7216a 100644 --- a/neonView/ContractFilter_view/ContractFilter_view.aod +++ b/neonView/ContractFilter_view/ContractFilter_view.aod @@ -6,10 +6,10 @@ <dashletConfigurations> <neonDashletConfiguration> <name>AllContractsDashlet</name> - <title>Verträge</title> - <description>Alle Verträge anzeigen</description> + <title>Contracts</title> + <description>Show all contracts</description> <fragment>Contract_context/filter</fragment> - <singleton v="false" /> + <singleton v="true" /> <requiresConfiguration v="false" /> <icon>vaadin:form</icon> <categories> diff --git a/neonView/FacebookTimeline_view/FacebookTimeline_view.aod b/neonView/FacebookTimeline_view/FacebookTimeline_view.aod index 241b18b88d..f05c7ac403 100644 --- a/neonView/FacebookTimeline_view/FacebookTimeline_view.aod +++ b/neonView/FacebookTimeline_view/FacebookTimeline_view.aod @@ -6,8 +6,8 @@ <dashletConfigurations> <neonDashletConfiguration> <name>AditoFacebookDashlet</name> - <title>ADITO FB Feed</title> - <description>Alle Facebook Posts von ADITO</description> + <title>ADITO Facebook Feed</title> + <description>Show all Facebook posts of ADITO</description> <fragment>Social_context/full</fragment> <singleton v="true" /> <requiresConfiguration v="false" /> @@ -32,7 +32,7 @@ <neonDashletConfiguration> <name>FacebookDashletConfig</name> <title>Facebook Feed</title> - <description>Zeigt alle Facebook Posts eines Benutzers an</description> + <description>Show all Facebook posts of a user</description> <fragment>Social_context/full</fragment> <requiresConfiguration v="true" /> <icon>vaadin:facebook_square</icon> diff --git a/neonView/OfferFilter_view/OfferFilter_view.aod b/neonView/OfferFilter_view/OfferFilter_view.aod index b87d5299bf..13e05cb76b 100644 --- a/neonView/OfferFilter_view/OfferFilter_view.aod +++ b/neonView/OfferFilter_view/OfferFilter_view.aod @@ -6,10 +6,10 @@ <dashletConfigurations> <neonDashletConfiguration> <name>AllOffersDashlet</name> - <title>Angebote</title> - <description>Alle Angebote anzeigen</description> + <title>Offers</title> + <description>Show all offers</description> <fragment>Offer_context/filter</fragment> - <singleton v="false" /> + <singleton v="true" /> <requiresConfiguration v="false" /> <icon>vaadin:cart</icon> <categories> @@ -25,8 +25,8 @@ </neonDashletConfiguration> <neonDashletConfiguration> <name>SendOffersDashlet</name> - <title>Versendete Angebote</title> - <description>Alle versendeten Angebote anzeigen</description> + <title>Sent offers</title> + <description>Show all sent offers</description> <fragment>Offer_context/filter?search=W3sibmFtZSI6IlNUQVRVUyIsIm9wZXJhdG9yIjoiRVFVQUwiLCJ2YWx1ZUtleSI6IjIiLCJ2YWx1ZSI6IlZlcnNlbmRldCIsImNvbnRlbnRUeXBlIjoiVEVYVCJ9XQ%253D%253D</fragment> <singleton v="true" /> <requiresConfiguration v="false" /> diff --git a/neonView/OrderFilter_view/OrderFilter_view.aod b/neonView/OrderFilter_view/OrderFilter_view.aod index 1f4061c4df..a8a3b274cc 100644 --- a/neonView/OrderFilter_view/OrderFilter_view.aod +++ b/neonView/OrderFilter_view/OrderFilter_view.aod @@ -6,10 +6,10 @@ <dashletConfigurations> <neonDashletConfiguration> <name>AllOrdersDashlet</name> - <title>Receipt</title> + <title>Receipts</title> <description>Show all receipts</description> <fragment>Order_context/filter</fragment> - <singleton v="false" /> + <singleton v="true" /> <requiresConfiguration v="false" /> <icon>VAADIN:FILE_TEXT_O</icon> <categories> diff --git a/neonView/OrgFilter_view/OrgFilter_view.aod b/neonView/OrgFilter_view/OrgFilter_view.aod index 8519435d65..17e2c88172 100644 --- a/neonView/OrgFilter_view/OrgFilter_view.aod +++ b/neonView/OrgFilter_view/OrgFilter_view.aod @@ -6,10 +6,10 @@ <dashletConfigurations> <neonDashletConfiguration> <name>AllOrgsDashlet</name> - <title>Firmen</title> - <description>Alle Firmen anzeigen</description> + <title>Companies</title> + <description>Show all companies</description> <fragment>Org_context/filter</fragment> - <singleton v="false" /> + <singleton v="true" /> <requiresConfiguration v="false" /> <icon>vaadin:building</icon> <categories> diff --git a/neonView/PersFilter_view/PersFilter_view.aod b/neonView/PersFilter_view/PersFilter_view.aod index a7d46d406e..00f794fa1e 100644 --- a/neonView/PersFilter_view/PersFilter_view.aod +++ b/neonView/PersFilter_view/PersFilter_view.aod @@ -6,10 +6,10 @@ <dashletConfigurations> <neonDashletConfiguration> <name>AllContactsDashlet</name> - <title>Kontakte</title> - <description>Alle Kontaktpersonen anzeigen</description> + <title>Contacts</title> + <description>Show all contacts</description> <fragment>Pers_context/filter</fragment> - <singleton v="false" /> + <singleton v="true" /> <requiresConfiguration v="false" /> <icon>vaadin:users</icon> <categories> diff --git a/neonView/ProductFilter_view/ProductFilter_view.aod b/neonView/ProductFilter_view/ProductFilter_view.aod index 8ebe0ab781..d3fd099c87 100644 --- a/neonView/ProductFilter_view/ProductFilter_view.aod +++ b/neonView/ProductFilter_view/ProductFilter_view.aod @@ -6,10 +6,10 @@ <dashletConfigurations> <neonDashletConfiguration> <name>AllProductsDashlet</name> - <title>Produkte</title> - <description>Alle Produkte anzeigen</description> + <title>Products</title> + <description>Show all products</description> <fragment>Product_context/filter</fragment> - <singleton v="false" /> + <singleton v="true" /> <requiresConfiguration v="false" /> <icon>vaadin:hammer</icon> <categories> diff --git a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod index 49e132fda1..9d40326094 100644 --- a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod +++ b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod @@ -6,10 +6,10 @@ <dashletConfigurations> <neonDashletConfiguration> <name>AllSalesprojectDashlet</name> - <title>Vertriebsprojekte</title> - <description>Alle Vertriebsprojekte anzeigen</description> + <title>Salesprojects</title> + <description>Show all salesprojects</description> <fragment>Salesproject_context/filter</fragment> - <singleton v="false" /> + <singleton v="true" /> <requiresConfiguration v="false" /> <icon>vaadin:filter</icon> <categories> @@ -25,8 +25,8 @@ </neonDashletConfiguration> <neonDashletConfiguration> <name>OpenSalesprojectsDashlet</name> - <title>Offene Vertriebsprojekte</title> - <description>Alle offenen Vertriebsprojekte anzeigen</description> + <title>Open salesprojects</title> + <description>Show open salesprojects</description> <fragment>Salesproject_context/filter?search=W3sibmFtZSI6IlNUQVRFIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlS2V5IjoiMSIsInZhbHVlIjoiT2ZmZW4iLCJjb250ZW50VHlwZSI6IlRFWFQifV0%253D</fragment> <singleton v="true" /> <requiresConfiguration v="false" /> diff --git a/neonView/TwitterTimeline_view/TwitterTimeline_view.aod b/neonView/TwitterTimeline_view/TwitterTimeline_view.aod index 287170c628..aaa216d051 100644 --- a/neonView/TwitterTimeline_view/TwitterTimeline_view.aod +++ b/neonView/TwitterTimeline_view/TwitterTimeline_view.aod @@ -6,8 +6,8 @@ <dashletConfigurations> <neonDashletConfiguration> <name>AditoTwitterDashlet</name> - <title>Neues von ADITO</title> - <description>Alle Tweets von ADITO</description> + <title>ADITO Twitter Feed</title> + <description>Show all tweets of ADITO</description> <fragment>Social_context/full</fragment> <singleton v="true" /> <requiresConfiguration v="false" /> @@ -31,8 +31,8 @@ </neonDashletConfiguration> <neonDashletConfiguration> <name>TwitterDashletConfig</name> - <title>Twitter Timeline</title> - <description>Zeigt alle Tweets eines Benutzers</description> + <title>Twitter Feed</title> + <description>Show all tweets of a user</description> <fragment>Social_context/full</fragment> <requiresConfiguration v="true" /> <icon>vaadin:twitter_square</icon> diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod index 088db29910..30d8839f2a 100644 --- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod +++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod @@ -2,7 +2,7 @@ <preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.0.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.0.2"> <name>_____PREFERENCES_PROJECT</name> <majorModelMode>DISTRIBUTED</majorModelMode> - <projectName>xRM-Basic 5</projectName> + <projectName>xRM-Basic5</projectName> <jditoMaxContentSize v="57671680" /> <calendarCategoriesEvent> <entry> -- GitLab