Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit 185097c

Browse files
committed
Merge branch 'develop' of https://github.com/pydio/pydio-core into develop
First go at vagrant config * 'develop' of https://github.com/pydio/pydio-core: Fix minisite error when public url differs from default, by passing original data or trying to use the SERVER_URL parameter. Re-format to be able execute from Pydio installer 6.4.0 release note Final 6.4.0 html release note. Fix #1116 i18n fixes Unified german translations of all index plugins Clean unused css - Fix top toolbar buttons. Updated german translations of various plugins Added german translations for access.inbox plugin Added german translation for core.osc plugin Made more strings in core.mailer translatable Made share rights translatable in info panel Simple admin action to check if a table exists. Use %i instead of %b otherwise it fails on PostgreSql
2 parents 3f777f7 + 7446b98 commit 185097c

File tree

53 files changed

+756
-1202
lines changed

Some content is hidden

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

53 files changed

+756
-1202
lines changed

core/src/conf/RELEASE_NOTE

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ Pydio 6.4.0 is a stable release introducing many important new features!
55
Installation is done via the "Stable" update channel in-app.
66
Noticeable changes
77

8-
Sharing Deeply Reworked:
9-
Ability to now share files with other users (without creating necessarily a public link)
10-
Ability to toggle the visibility of a share inside a common workspace, to let other users edit this share
11-
Implementation of the Federated Sharing API to allow sharing files and folders accross Pydio instances, and with other software providers implementing this API (currently OwnCloud).
12-
Rework of the share panel, with direct-click for copy, better expiration date visualisation, and many more
8+
Sharing Deeply Reworked
9+
* Ability to now share files with other users (without creating necessarily a public link)
10+
* Ability to toggle the visibility of a share inside a common workspace, to let other users edit this share
11+
* Implementation of the Federated Sharing API to allow sharing files and folders accross Pydio instances, and with other software providers implementing this API (currently OwnCloud).
12+
* Rework of the share panel, with direct-click for copy, better expiration date visualisation, and many more
1313
UI transitioning smoothly to Material Design and ReactJS: following our previous work on the Enterprise Distribution with Material Design guidelines, and listening to your feedback about the UI. Changes are subtle (no big reorganization), but interface should be really clearer.
1414
Mails Digest : avoid receiving tons of emails when watching for a file or folder modification, and opt-in for an hourly/daily/weekly based digest instead.
1515
CacheService mechanism : extension of our previous work with in-memory cache to support many types of key-value stores (apc, memcache, reddis, etc..). We are using the well-established Doctrine Cache component.

core/src/plugins/access.ajxp_conf/i18n/de.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"9" => "Zugriffstyp",
3232
"10" => "Meta-Quelle",
3333
"11" => "Quelle hinzufügen",
34-
"12" => "Meta-Plugin",
34+
"12" => "Meta-Erweiterung",
3535
"13" => "Wollen Sie die Quelle wirklich löschen?",
3636
"14" => "Wahr",
3737
"15" => "Falsch",
@@ -74,7 +74,7 @@
7474
"52" => "Arbeitsumgebung erfolgreich erstellt",
7575
"53" => "Fehler beim Ändern der Arbeitsumgebung",
7676
"54" => "Arbeitsumgebung erfolgreich geändert",
77-
"55" => "Achtung, zur Zeit kann nur eine Instanz von jedem Meta-Plugin hinzugefügt werden.",
77+
"55" => "Achtung, zur Zeit kann nur eine Instanz von jeder Meta-Erweiterung hinzugefügt werden.",
7878
"56" => "Meta Quelle erfolgreich hinzugefügt",
7979
"57" => "Meta Quelle erfolgreich gelöscht",
8080
"58" => "Meta Quelle erfolgreich geändert",
@@ -121,14 +121,14 @@
121121
"97" => "Einstellungen der Erweiterung erfolgreich aktualisiert",
122122
"98" => "Grundeinstellungen",
123123
"99" => "Erweiterungen",
124-
"100" => "Allgemeine '%s' Plugin-Optionen",
124+
"100" => "Allgemeine '%s' Erweiterungs-Einstellungen",
125125
"101" => "Name",
126126
"102" => "Bezeichnung",
127127
"103" => "Beschreibung",
128128
"104" => "Aktiv",
129129
"105" => "Testergebnis",
130130
"106" => "Einmalige ID",
131-
"107" => "Plugin-Konfigurationen",
131+
"107" => "Erweiterungs-Konfigurationen",
132132
"108" => "Dokumentation",
133133
"109" => "Einstellungen",
134134
"110" => "Arbeitsumgebungen & Benutzer",
@@ -137,8 +137,8 @@
137137
"113" => "Der Status der Rolle wurde erfogreich geändert",
138138
"114" => "Standard",
139139
"115" => "Schema",
140-
"116" => "Template-Bezeichnung",
141-
"117" => "Template-Treiber",
140+
"116" => "Vorlagen-Bezeichnung",
141+
"117" => "Vorlagen-Treiber",
142142
"118" => "Neue Gruppe",
143143
"group_access" => "G",
144144
"119" => "Benutzergruppe setzen",
@@ -173,14 +173,14 @@
173173
"148" => "Hook-Definition",
174174
"149" => "Liste aller Hooks mit Informationen, wo und von welchen Erweiterungen diese aufgerufen werden.",
175175
"150" => "Eine Arbeitsumgebung auswählen",
176-
"151" => "Root Group",
177-
"152" => "Root Group Role",
178-
"153" => "Applies to the whole hierarchy of users",
176+
"151" => "Haupt-Gruppe",
177+
"152" => "Rolle der Haupt-Gruppe",
178+
"153" => "Wird auf alle Benutzer in der Hierarchie angewendet",
179179
"154" => "Vorlagen für Arbeitsumgebungen",
180180
"155" => "Treiber",
181181
"156" => "Standard", // user type standard
182182
"157" => "Administrator",
183183
"158" => "Freigabebenutzer", // user type shared
184184
"159" => "Gast",
185-
"160" => "Group was successfully created",
185+
"160" => "Die Gruppe wurde erfolgreich erstellt",
186186
);

core/src/plugins/access.ajxp_home/res/i18n/de.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
*/
2121
$mess=array(
2222
"title"=> "Home",
23-
"desc" => "Welcome page",
23+
"desc" => "Willkommen-Seite",
2424
"39"=> "Arbeitsumgebung auswählen",
2525
"40"=> "Willkommen, %s",
26-
"41"=> "Diese Arbeitsumgebung standardmässig verwenden",
26+
"41"=> "Standardmässig verwenden",
2727
"42"=> "Betreten",
2828
"43"=> "Mein Profil",
2929
"43t"=> "Alle meine persönlichen Dateien",
@@ -80,8 +80,8 @@
8080
<li>App mit einem PIN-Code schützen</li>
8181
<li>Verwenden von Lesezeichen und der Suchfunktion</li></ul>",
8282
"67"=> "Sie sind nicht %s? %logout",
83-
"68"=> "Download Sync Client for Windows",
84-
"69"=> "Download Sync Client for Mac OSX",
85-
"70"=> "Native application for iOS devices",
86-
"71"=> "Native application for Android Devices",
83+
"68"=> "Sync-Client für Windows herunterladen",
84+
"69"=> "Sync-Client für Mac OSX herunterladen",
85+
"70"=> "App für iOS-Geräte",
86+
"71"=> "App für Android-Geräte",
8787
);

core/src/plugins/access.ajxp_user/i18n/de.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
$mess=array(
2222
"title"=> "Mein Dashboard",
23-
"desc" => "Verwalte meine Kontoeinstellungen, mein Adressbuch, geteilte Elemente, etc.",
23+
"desc" => "Mein Benutzerkonto, Adressbuch, Freigaben, etc. verwalten",
2424
"1" => "Freigegebene Benutzer",
2525
"2" => "Freigegebene Ordner",
2626
"3" => "Freigegebene Dateien",

core/src/plugins/access.fs/i18n/conf/de.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"Use system command line to get the filesize instead of php built-in function (fixes the 2Go limitation)" => "Verwendet die Systemfunktion zum Ermitteln der Dateigröße statt der integrierten PHP-Funktion (beseitigt das 2GB Limit). ",
3434
"X-SendFile Active" => "X-SendFile Aktiv",
3535
"Delegates all download operations to the webserver using the X-SendFile header. Warning, this is an external module to install for Apache. Module is active by default in Lighttpd. Warning, you have to manually add the folders where files will be downloaded in the module configuration (XSendFilePath directive)" => "Alle Downloadoperationen zum Webserver verwenden den X-SendFile-Header. Achtung dies ist ein externes Modul zum Installieren für Apache. Das Modul ist bei Lighttpd standardmäßig aktiv. Achtung, in der Modul-Konfiguration müssen die Download-Verzeichnisse von Hand angegeben werden (XSendFilePath directive)",
36-
"Data template" => "Daten-Template",
36+
"Data template" => "Daten-Vorlage",
3737
"Path to a directory on the filesystem whose content will be copied to the repository the first time it is loaded." => "Pfad zu einem Verzeichnis des Dateisystems, die enthaltenen Dateien werden beim ersten Laden in die Arbeitsumgebung kopiert.",
3838
"Purge Days (Hard limit)" => "Tage bis Bereinigung (Hard limit)",
3939
"Option to purge documents after a given number of days (even if shared). This require a manual set up of a CRON task. Leave to 0 if you don't wan't to use this feature." => "Option um Dokumente nach einer bestimmten Anzahl von Tagen (auch wenn sie freigegeben wurden) zu löschen. Dies erfordert die manuelle Einrichtung eines Cron-Jobs. Lassen Sie 0, wenn Sie die Funktion nicht verwenden möchten.",

core/src/plugins/access.imap/resources/i18n/conf/de.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737
"User Password" => "Passwort des Benutzers",
3838
"Default Mailbox" => "Standard Mailbox",
3939
"Mailbox to connect by default" => "Mailbox-Verbindung die standardmäßig verbunden wird",
40-
"Repository Options" => "Repository Options",
41-
"Default Rights" => "Default Rights",
42-
"This right pattern (empty, r, or rw) will be applied at user creation for this repository." => "This right pattern (empty, r, or rw) will be applied at user creation for this repository.",
43-
"Pagination Threshold" => "Pagination Threshold",
44-
"When a folder will contain more items than this number, display will switch to pagination mode, for better performances." => "When a folder will contain more items than this number, display will switch to pagination mode, for better performances.",
45-
"#Items per page" => "#Items per page",
46-
"Once in pagination mode, number of items to display per page." => "Once in pagination mode, number of items to display per page.",
40+
"Repository Options" => "Arbeitsumgebungs-Einstellungen",
41+
"Default Rights" => "Standard-Rechte",
42+
"This right pattern (empty, r, or rw) will be applied at user creation for this repository." => "Rechte-Pattern, welches beim Anlegen von Benutzern für diese Arbeitsumgebung angewendet wird. (leer, r oder rw)",
43+
"Pagination Threshold" => "Schwellwert für Seitenwechsel",
44+
"When a folder will contain more items than this number, display will switch to pagination mode, for better performances." => "Wenn es mehr als die konfigurierte Anzahl an Seiten gibt, wird der Seitenwechsel aktiviert.",
45+
"#Items per page" => "Einträge pro Seite",
46+
"Once in pagination mode, number of items to display per page." => "Anzahl der Einträge pro Seite, wenn Seitenwechsel aktiv ist.",
4747
);
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?php
2+
$mess = array(
3+
"1" => "Einladung",
4+
"1p" => "Einladungen",
5+
"2" => "Freigegebene Datei",
6+
"2p" => "Freigegebene Dateien",
7+
"3" => "Ungültige Freigabe",
8+
"3p" => "Ungültige Freigaben",
9+
"4" => "ausstehend",
10+
"5" => "Fehler",
11+
"6" => "Für Sie freigegebene Dateien",
12+
"7" => "Für Sie freigegebene Dateien und Ordner anderer Benutzer.",
13+
"8" => "Schnellsuche",
14+
"9" => "Dateiname",
15+
"10" => "Typ",
16+
"11" => "Leeren",
17+
"12" => "Freigegebene Dateien",
18+
"13" => "Für Sie freigegebene Dateien",
19+
"14" => "In eine Arbeitsumgebung kopieren",
20+
"15" => "Die Datei in eine der eigenen Arbeitsumgebungen kopieren",
21+
);

core/src/plugins/access.mysql/resources/i18n/de.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
$mess=array(
2222
"1" => "Tabelle erstellen",
23-
"2" => "SQL Abfrage hier eingeben",
23+
"2" => "SQL-Abfrage hier eingeben",
2424
"3" => "Suchen",
2525
"4" => "Löschen"
2626
);

core/src/plugins/access.wms/i18n/conf/de.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
* The latest code can be found at <http://pyd.io/>.
2020
*/
2121
$mess=array(
22-
"WMS Server" => "WMS Server",
23-
"Browse the layers served by a WMS server." => "Layers eines WMS Servers durchsuchen.",
24-
"Wms Server" => "Wms Server",
25-
"Wms server url" => "Wms server url",
22+
"WMS Server" => "WMS-Server",
23+
"Browse the layers served by a WMS server." => "Layers eines WMS-Servers durchsuchen.",
24+
"Wms Server" => "WMS-Server",
25+
"Wms server url" => "WMS-Server-URL",
2626
);

core/src/plugins/action.cart/i18n/de.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"4" => "Ausgewählten Korb leeren",
2828
"5" => "Neu",
2929
"6" => "Neuen Korb anlegen",
30-
"7" => "Download",
30+
"7" => "Herunterladen",
3131
"8" => "Inhalt des ausgewählten Korbs herunterladen",
3232
"9" => "Standard-Korb",
3333
"10"=> "Körbe",

0 commit comments

Comments
 (0)