|
|
21.
|
|
|
Perform a 2-way or 3-way merge on the given profiles
|
|
|
|
|
对给定的配置文件执行双向或三向合并
|
|
Translated and reviewed by
Yulin Yang
|
|
|
|
Located in
../aa-mergeprof:29
|
|
|
22.
|
|
|
your profile
|
|
|
|
|
您的配置文件
|
|
Translated and reviewed by
Harry Chen
|
|
|
|
Located in
../aa-mergeprof:31
|
|
|
23.
|
|
|
base profile
|
|
|
|
|
基础配置文件
|
|
Translated by
Harry Chen
|
|
Reviewed by
玉堂白鹤
|
|
|
|
Located in
../aa-mergeprof:32
|
|
|
24.
|
|
|
other profile
|
|
|
|
|
其他配置文件
|
|
Translated and reviewed by
Harry Chen
|
|
|
|
Located in
../aa-mergeprof:33
|
|
|
25.
|
|
|
The following local profiles were changed. Would you like to save them?
|
|
|
|
|
以下本地配置文件已更改。你想保存它们吗？
|
|
Translated and reviewed by
Yulin Yang
|
|
|
|
Located in
../aa-mergeprof:67 ../apparmor/aa.py:2345
|
|
|
26.
|
|
|
Path
|
|
|
|
|
路径
|
|
Translated and reviewed by
Harry Chen
|
|
|
|
Located in
../aa-mergeprof:148 ../aa-mergeprof:430 ../apparmor/aa.py:1767
|
|
|
27.
|
|
|
Select the appropriate mode
|
|
|
|
|
选择合适的模式
|
|
Translated and reviewed by
Harry Chen
|
|
|
|
Located in
../aa-mergeprof:149
|
|
|
28.
|
|
|
Unknown selection
|
|
|
|
|
未知选择
|
|
Translated by
Harry Chen
|
|
Reviewed by
玉堂白鹤
|
|
|
|
Located in
../aa-mergeprof:166
|
|
|
29.
|
|
|
File includes
|
|
|
|
|
包括的文件
|
|
Translated by
Harry Chen
|
|
Reviewed by
玉堂白鹤
|
|
|
|
Located in
../aa-mergeprof:183 ../aa-mergeprof:209
|
|
|
30.
|
|
|
Select the ones you wish to add
|
|
|
|
|
选择要添加的内容
|
|
Translated and reviewed by
Yulin Yang
|
|
|
|
Located in
../aa-mergeprof:183 ../aa-mergeprof:209
|
