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

Commit e5ac62c

Browse files
cdujeucdujeu
committed
Merge branch 'develop' of https://github.com/pydio/pydio-core into develop
2 parents b97e198 + aa61272 commit e5ac62c

File tree

305 files changed

+4901
-914
lines changed

Some content is hidden

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

305 files changed

+4901
-914
lines changed

‎core/src/plugins/access.ajxp_conf/class.ajxp_confAccessDriver.php

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ public function listAllActions($action, $httpVars, $fileVars)
9494
$repoOut[$repoObject->getId()] = $repoObject->getDisplay();
9595
}
9696
HTMLWriter::charsetHeader("application/json");
97-
echo json_encode(array("LEGEND" => "Select a workspace", "LIST" => $repoOut));
97+
$mess = ConfService::getMessages();
98+
echo json_encode(array("LEGEND" => $mess["ajxp_conf.150"], "LIST" => $repoOut));
9899

99100
break;
100101

@@ -307,25 +308,25 @@ public function switchAction($action, $httpVars, $fileVars)
307308
"data" => array(
308309
"LABEL" => $mess["ajxp_conf.110"],
309310
"ICON" => "user.png",
310-
"DESCRIPTION" => "Day-to-day administration of the application : who accesses to what, create roles, etc.",
311+
"DESCRIPTION" => $mess["ajxp_conf.137"],
311312
"CHILDREN" => array(
312313
"repositories" => array(
313314
"AJXP_MIME" => "workspaces_zone",
314315
"LABEL" => $mess["ajxp_conf.3"],
315-
"DESCRIPTION" => "Create and delete workspaces, add features to them using meta sources.",
316+
"DESCRIPTION" => $mess["ajxp_conf.138"],
316317
"ICON" => "hdd_external_unmount.png",
317318
"LIST" => "listRepositories"),
318319
"users" => array(
319320
"AJXP_MIME" => "users_zone",
320321
"LABEL" => $mess["ajxp_conf.2"],
321-
"DESCRIPTION" => "Manage users and groups",
322+
"DESCRIPTION" => $mess["ajxp_conf.139"],
322323
"ICON" => "users-folder.png",
323324
"LIST" => "listUsers"
324325
),
325326
"roles" => array(
326327
"AJXP_MIME" => "roles_zone",
327328
"LABEL" => $mess["ajxp_conf.69"],
328-
"DESCRIPTION" => "Define profiles that can be applied at once to whole bunch of users.",
329+
"DESCRIPTION" => $mess["ajxp_conf.140"],
329330
"ICON" => "user-acl.png",
330331
"LIST" => "listRoles"),
331332
)
@@ -334,57 +335,57 @@ public function switchAction($action, $httpVars, $fileVars)
334335
"AJXP_MIME" => "plugins_zone",
335336
"LABEL" => $mess["ajxp_conf.109"],
336337
"ICON" => "preferences_desktop.png",
337-
"DESCRIPTION" => "Global configurations of the application core and of each plugin. Enable/disable plugins",
338+
"DESCRIPTION" => $mess["ajxp_conf.136"],
338339
"CHILDREN" => array(
339340
"core" => array(
340341
"AJXP_MIME" => "plugins_zone",
341342
"LABEL" => $mess["ajxp_conf.98"],
342-
"DESCRIPTION" => "Core application parameters",
343+
"DESCRIPTION" => $mess["ajxp_conf.133"],
343344
"ICON" => "preferences_desktop.png",
344345
"LIST" => "listPlugins"),
345346
"plugins" => array(
346347
"AJXP_MIME" => "plugins_zone",
347348
"LABEL" => $mess["ajxp_conf.99"],
348-
"DESCRIPTION" => "Enable/disable additional feature-oriented plugins, check if they are correctly working, set up global parameters of the plugins.",
349+
"DESCRIPTION" => $mess["ajxp_conf.134"],
349350
"ICON" => "folder_development.png",
350351
"LIST" => "listPlugins"),
351352
"core_plugins" => array(
352353
"AJXP_MIME" => "plugins_zone",
353354
"LABEL" => $mess["ajxp_conf.123"],
354-
"DESCRIPTION" => "Enable/disable core plugins (auth, conf, mail, etc), check if they are correctly working. Configuration of these plugins are generally done through the Main Options",
355+
"DESCRIPTION" => $mess["ajxp_conf.135"],
355356
"ICON" => "folder_development.png",
356357
"LIST" => "listPlugins"),
357358
)
358359
),
359360
"admin" => array(
360361
"LABEL" => $mess["ajxp_conf.111"],
361362
"ICON" => "toggle_log.png",
362-
"DESCRIPTION" => "Administrator tasks to monitor the application state.",
363+
"DESCRIPTION" => $mess["ajxp_conf.141"],
363364
"CHILDREN" => array(
364365
"logs" => array(
365366
"LABEL" => $mess["ajxp_conf.4"],
366-
"DESCRIPTION" => "Monitor all activities happening on the server",
367+
"DESCRIPTION" => $mess["ajxp_conf.142"],
367368
"ICON" => "toggle_log.png",
368369
"LIST" => "listLogFiles"),
369370
"diagnostic" => array(
370371
"LABEL" => $mess["ajxp_conf.5"],
371-
"DESCRIPTION" => "Read the start-up diagnostic",
372+
"DESCRIPTION" => $mess["ajxp_conf.143"],
372373
"ICON" => "susehelpcenter.png", "LIST" => "printDiagnostic")
373374
)
374375
),
375376
"developer" => array(
376-
"LABEL" => "Developer Resources",
377+
"LABEL" => $mess["ajxp_conf.144"],
377378
"ICON" => "applications_engineering.png",
378-
"DESCRIPTION" => "Generated documentations for developers",
379+
"DESCRIPTION" => $mess["ajxp_conf.145"],
379380
"CHILDREN" => array(
380381
"actions" => array(
381-
"LABEL" => "Actions API",
382-
"DESCRIPTION" => "List all actions contributed by all plugins and visualize their input parameters",
382+
"LABEL" => $mess["ajxp_conf.146"],
383+
"DESCRIPTION" => $mess["ajxp_conf.147"],
383384
"ICON" => "book.png",
384385
"LIST" => "listActions"),
385386
"hooks" => array(
386-
"LABEL" => "Hooks Definitions",
387-
"DESCRIPTION" => "List all hooks triggered in the application, their documentation, where there are triggered and which plugin listen to them.",
387+
"LABEL" => $mess["ajxp_conf.148"],
388+
"DESCRIPTION" => $mess["ajxp_conf.149"],
388389
"ICON" => "book.png",
389390
"LIST" => "listHooks")
390391
)

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?php
2+
/*
3+
* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
4+
* This file is part of Pydio.
5+
*
6+
* Pydio is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU Affero General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* Pydio is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU Affero General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU Affero General Public License
17+
* along with Pydio. If not, see <http://www.gnu.org/licenses/>.
18+
*
19+
* The latest code can be found at <http://pyd.io/>.
20+
*/
21+
// german translation: Axel Otterstätter <[email protected]>
22+
23+
$mess=array(
24+
"Admin Driver" => "Administration",
25+
"Access Pydio configuration data." => "Die Pydio-Konfiguration administrieren",
26+
);

‎core/src/plugins/access.ajxp_conf/i18n/conf/en.php

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?php
2+
/*
3+
* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
4+
* This file is part of Pydio.
5+
*
6+
* Pydio is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU Affero General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* Pydio is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU Affero General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU Affero General Public License
17+
* along with Pydio. If not, see <http://www.gnu.org/licenses/>.
18+
*
19+
* The latest code can be found at <http://pyd.io/>.
20+
*/
21+
$mess=array(
22+
"Admin Driver" => "Admin Driver",
23+
"Access Pydio configuration data." => "Access Pydio configuration data.",
24+
);

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

Lines changed: 40 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,34 +24,34 @@
2424
"1" => "Konfigurationsdaten",
2525
"2" => "Benutzer & Gruppen",
2626
"3" => "Arbeitsumgebungen",
27-
"4" => "Logs",
27+
"4" => "Protokolle",
2828
"5" => "Diagnose",
29-
"6" => "Benutzername",
29+
"6" => "Name",
3030
"7" => "Ist Admin",
31-
"8" => "Arbeitsumgebung Bezeichnung",
31+
"8" => "Bezeichnung",
3232
"9" => "Zugriffstyp",
3333
"10" => "Meta Quelle",
3434
"11" => "Quelle hinzufügen",
3535
"12" => "Meta Plugin",
3636
"13" => "Wollen Sie die Quelle wirklich löschen?",
3737
"14" => "Wahr",
3838
"15" => "Falsch",
39-
"16" => "Datei Datum",
39+
"16" => "Datum",
4040
"17" => "Datum",
4141
"18" => "IP",
4242
"19" => "Ebene",
4343
"20" => "Benutzer",
4444
"21" => "Aktion",
4545
"22" => "Param.",
46-
"23" => "Test Name",
47-
"24" => "Test Daten",
46+
"23" => "Test",
47+
"24" => "Ergebnis",
4848
"25" => "Arbeitsumgebung-Zugriffe",
4949
"26" => "Passwort ändern",
5050
"27" => "Adminrechte",
5151
"28" => "Benutzer hat Adminrechte?",
5252
"29" => "Lesen",
5353
"30" => "Schreiben",
54-
"32" => "Arbeitsumgebung-Treiber",
54+
"32" => "Treiber",
5555
"33" => "Lade...",
5656
"34" => "Soll der Benutzer wirklich gelöscht werden? Dies kann nicht rückgängig gemacht werden!",
5757
"35" => "Soll diese Arbeitsumgebung wirklich gelöscht werden? Dies kann nicht rückgängig gemacht werden!",
@@ -81,7 +81,7 @@
8181
"59" => "Arbeitsumgebung erfolgreich gelöscht",
8282
"60" => "Benutzer erfolgreich entfernt",
8383
"61" => "Fehlerhafte Parameter!",
84-
"62" => "Rechte Zusammenfassung",
84+
"62" => "Rechte",
8585
"63" => "Alle",
8686
"64" => "Rechte der Rolle ändern ",
8787
"65" => "Die Rolle existiert, bitte einen anderen Namen wählen!",
@@ -100,7 +100,7 @@
100100
"77" => "Zugriffssteuerung",
101101
"78" => "Persönliche Daten",
102102
"79" => "Arbeitsumgebung",
103-
"80" => "Detaillierter Zugriff für diesen Benutzer (Click on a Arbeitsumgebung label if you wish to make it the default Arbeitsumgebung when user logs in)",
103+
"80" => "Detaillierter Zugriff für diesen Benutzer (Auf eine Arbeitsumgebung klicken, um diese bei der Benutzeranmeldung standardmäßig öffnen zu lassen)",
104104
"81" => "Typische Arbeitsumgebung-Inhalte",
105105
"82" => "Benutzer Batch-editieren",
106106
"83" => "Drag'n'Drop der Rollen um diese allen ausgewählten Benutzern zuzuweisen (Freigegebene Benutzer werden übersprungen)",
@@ -118,19 +118,19 @@
118118
"95" => "Eine Bezeichnung und einen Treiber für den Datenzugriff wählen (Alle Bereich auf vorgeschriebene Felder prüfen, wenn sich die Maus auf einer Bezeichnung befindet, dann werden weitere Infos angezeigt).",
119119
"96" => "Wenn eine Bezeichnung vergeben und der Treiber ausgewählt wurde, dann aktivieren Sie die Felder die in der Vorlage ausgefüllt sein sollen mit Hilfe der Chexckboxen. Die übrigen Felder kann der Benutzer ändern. Wenn ein Feld aktiviert und leer gelassen wird, dann wird das Feld vor dem Benutzer versteckt.",
120120
"repository_access_key" => "N",
121-
"97" => "Optionen des Plugins erfolgreich aktualisiert",
122-
"98" => "Grundkonfiguration",
123-
"99" => "Plugins",
121+
"97" => "Einstellungen der Erweiterung erfolgreich aktualisiert",
122+
"98" => "Grundeinstellungen",
123+
"99" => "Erweiterungen",
124124
"100" => "Allgemeine '%s' Plugin-Optionen",
125125
"101" => "Name",
126126
"102" => "Bezeichnung",
127127
"103" => "Beschreibung",
128128
"104" => "Aktiv",
129-
"105" => "Automatik Checks",
129+
"105" => "Testergebnis",
130130
"106" => "Einmalige ID",
131131
"107" => "Plugin Konfigurationen",
132132
"108" => "Dokumentation",
133-
"109" => "Globale Konfigurationen",
133+
"109" => "Einstellungen",
134134
"110" => "Arbeitsumgebungen & Benutzer",
135135
"111" => "Logs & Andere Daten",
136136
"112" => "<b>Diese Rolle als Standard</b> für alle Benutzer festlegen",
@@ -145,14 +145,32 @@
145145
"120" => "Go Pro",
146146
"121" => "Holen Sie sich professionelle Unterstützung für Ihr System",
147147
"122" => "Alle Einstellungen",
148-
"123" => "Andere Plugins",
149-
"124" => "Source",
148+
"123" => "Kernfunktionalitäten",
149+
"124" => "Quelle",
150150
"125" => "Alias",
151151
"126" => "Sind Sie sicher, dass Sie die ausgewählten Elemente löschen möchten?",
152152
"127" => "Achtung, bitte verwenden Sie keine Sonderzeichen. Benutzer würde mit Login-ID '%s' erstellt werden.",
153-
"128" => "Successfully deleted group",
154-
"129" => "Refresh plugins cache",
155-
"130" => "Clear plugins cache, can be necessary to see new plugins appear in the list.",
156-
"131" => "Plugins cache files were deleted succesfully!",
157-
"132" => "Cache cleared, but you are currently running in SKIP_CACHE mode (see bootstrap_context.php).",
158-
);
153+
"128" => "Gruppe erfolgreich gelöscht",
154+
"129" => "Zwischenspeicher für Erweiterungen leeren",
155+
"130" => "Dies kann notwendig sein, damit neue Erweiterungen in der Liste erscheinen.",
156+
"131" => "Zwischenspeicher für Erweiterungen erfolgreich geleert!",
157+
"132" => "Zwischenspeicher wurde geleert, aber Pydio läuft im SKIP_CACHE Modus (siehe bootstrap_context.php).",
158+
"133" => "Grundeinstellungen der Anwendung",
159+
"134" => "Zusätzliche Funktionen aktivieren und prüfen, ob diese korrekt funktionieren.",
160+
"135" => "Erweiterungen für Kernfunktionalitäten aktivieren und prüfen, ob diese korrekt funktionieren. Die Erweiterungen werden in den Grundeinstellungen konfiguriert.",
161+
"136" => "Einstellungen der Anwendung, sowie aller Erweiterungen ändern",
162+
"137" => "Zugriffsrechte und Benutzer verwalten",
163+
"138" => "Arbeitsumgebungen anlegen und Funktionen und Metadaten festlegen.",
164+
"139" => "Benutzer und Gruppen verwalten",
165+
"140" => "Legt Profile fest, die auf eine Vielzahl von Benutzern anwendbar sind.",
166+
"141" => "Überwachung des Anwendungs-Status für administrative Aufgaben.",
167+
"142" => "Protokoll mit allen Anwendungs-Ereignissen auf dem Server",
168+
"143" => "Informationen aus der Start-Diagnose",
169+
"144" => "Informationen für Entwickler",
170+
"145" => "Dokumentation für Entwickler",
171+
"146" => "Aktions-API",
172+
"147" => "Liste aller Aktionen der Erweiterungen und die zugehörigen Eingabeparameter",
173+
"148" => "Hook-Definition",
174+
"149" => "Liste aller Hooks mit Informationen, wo und von welchen Erweiterungen diese aufgerufen werden.",
175+
"150" => "Eine Arbeitsumgebung auswählen",
176+
);

‎core/src/plugins/access.ajxp_conf/i18n/en.php

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,4 +153,22 @@
153153
"130" => "Clear plugins cache, can be necessary to see new plugins appear in the list.",
154154
"131" => "Plugins cache files were deleted succesfully!",
155155
"132" => "Cache cleared, but you are currently running in SKIP_CACHE mode (see bootstrap_context.php).",
156+
"133" => "Core application parameters",
157+
"134" => "Enable/disable additional feature-oriented plugins, check if they are correctly working, set up global parameters of the plugins.",
158+
"135" => "Enable/disable core plugins (auth, conf, mail, etc), check if they are correctly working. Configuration of these plugins are generally done through the Main Options",
159+
"136" => "Global configurations of the application core and of each plugin. Enable/disable plugins",
160+
"137" => "Day-to-day administration of the application : who accesses to what, create roles, etc.",
161+
"138" => "Create and delete workspaces, add features to them using meta sources.",
162+
"139" => "Manage users and groups",
163+
"140" => "Define profiles that can be applied at once to whole bunch of users.",
164+
"141" => "Administrator tasks to monitor the application state.",
165+
"142" => "Monitor all activities happening on the server",
166+
"143" => "Read the start-up diagnostic",
167+
"144" => "Developer Resources",
168+
"145" => "Generated documentations for developers",
169+
"146" => "Actions API",
170+
"147" => "List all actions contributed by all plugins and visualize their input parameters",
171+
"148" => "Hooks Definitions",
172+
"149" => "List all hooks triggered in the application, their documentation, where there are triggered and which plugin listen to them.",
173+
"150" => "Select a repository",
156174
);

‎core/src/plugins/access.ajxp_home/i18n/conf/de.php

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/*
3+
* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
4+
* This file is part of Pydio.
5+
*
6+
* Pydio is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU Affero General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* Pydio is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU Affero General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU Affero General Public License
17+
* along with Pydio. If not, see <http://www.gnu.org/licenses/>.
18+
*
19+
* The latest code can be found at <http://pyd.io/>.
20+
*/
21+
$mess=array(
22+
"Welcome Page"=> "Willkommen-Seite",
23+
"Welcome Page displaying a list of workspaces" => "Willkommen-Seite auf der eine Liste mit Arbeitsumgebungen angezeigt wird",
24+
"Open workspace by simple click" => "Arbeitsumgebung mit einfachem Klick öffnen",
25+
"Open workspace by simple click instead of double click." => "Arbeitsumgebung mit einfachem Klick öffnen statt mit Doppelklick.",
26+
"Enable Getting Started" => "'Erste Schritte' anzeigen",
27+
"Enable addition tabulation to access getting started videos" => "Link auf Videos, welche die ersten Schritte mit Pydio zeigen",
28+
"iOS App URL" => "URL zur iOS-App",
29+
"URL of the iOS application" => "URL zur iOS-App",
30+
"Android App URL" => "URL zur Android-App",
31+
"URL of the Android application" => "URL zur Android-App",
32+
"Windows PydioSync URL" => "URL zum Windows-Sync-Client",
33+
"URL of the windows sync application" => "URL zum Windows-Sync-Client",
34+
"Mac PydioSync URL" => "URL zum Mac-Sync-Client",
35+
"URL of the mac sync application" => "URL zum Mac-Sync-Client",
36+
);

0 commit comments

Comments
 (0)