mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-11-21 23:12:40 +00:00
Merge branch 'master' into feature/addMissingStrings2
Conflicts: UI/AdministrationUI/English.lproj/Localizable.strings UI/PreferencesUI/English.lproj/Localizable.strings UI/Templates/PreferencesUI/UIxFilterEditor.wox
This commit is contained in:
commit
9b0a2c5fae
390 files changed
+57470
-27697
No files matched your search
@@ -15,3 +15,12 @@
|
||||
"ACLs_description" = "<p>The Access Control Lists administration module allows to change the ACLs of each user's Calendars and Address books.</p><p>To modify the ACLs of a user's folder, type the name of the user in the search field at the top of the window and double-click on the desired folder.</p>";
|
||||
|
||||
"Name or Email" = "Name or Email";
|
||||
|
||||
/* Rights module: initial search message */
|
||||
"Start a search to edit the rights" = "Start a search to edit the rights";
|
||||
|
||||
/* Rights module: Empty search result */
|
||||
"No matching user" = "No matching user";
|
||||
|
||||
/* Rights module: no selection */
|
||||
"No resource selected" = "No resource selected";
|
||||
Reference in new issue
Block a user