mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-06 01:44:26 +02:00
Merge remote-tracking branch 'upstream/main' into limit-repo-size
This commit is contained in:
commit
b391383936
1879 files changed
+2110
-3920
No files matched your search
@@ -6,7 +6,7 @@
|
||||
/bazel-*
|
||||
|
||||
# Directories for the Bazel IntelliJ plugin containing the generated
|
||||
# IntelliJ project files and plugin configuration. Seperate directories are
|
||||
# IntelliJ project files and plugin configuration. Separate directories are
|
||||
# for the IntelliJ, Android Studio and CLion versions of the plugin.
|
||||
/.ijwb/
|
||||
/.aswb/
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
This software is copyrighted. Unlimited copying and redistribution
|
||||
of this package and/or its individual files are permitted
|
||||
as long as there are no modifications. Modifications, and
|
||||
redistribution of modifications, are also permitted, but
|
||||
only if the resulting package and/or files are renamed.
|
||||
@@ -0,0 +1,15 @@
|
||||
Copyright (c) 1995 David Nugent <davidn@blaze.net.au>
|
||||
All rights reserved.
|
||||
|
||||
|
||||
Redistribution and use in source and binary forms, with or without modification, is permitted provided that the following conditions are met:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright notice immediately at the beginning of the file, without modification, this list of conditions, and the following disclaimer.
|
||||
|
||||
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
|
||||
|
||||
3. This work was done expressly for inclusion into FreeBSD. Other use is permitted provided this notation is included.
|
||||
|
||||
4. Absolutely no warranty of function or purpose is made by the author David Nugent.
|
||||
|
||||
5. Modifications may be freely made to this file providing the above conditions are met.
|
||||
@@ -505,6 +505,7 @@ team_not_exist = The team does not exist.
|
||||
last_org_owner = You cannot remove the last user from the 'owners' team. There must be at least one owner for an organization.
|
||||
cannot_add_org_to_team = An organization cannot be added as a team member.
|
||||
duplicate_invite_to_team = The user was already invited as a team member.
|
||||
organization_leave_success = You have successfully left the organization %s.
|
||||
|
||||
invalid_ssh_key = Can not verify your SSH key: %s
|
||||
invalid_gpg_key = Can not verify your GPG key: %s
|
||||
|
||||
Reference in new issue
Block a user