|
|
21.
|
|
|
Perform a 2-way or 3-way merge on the given profiles
|
|
|
|
|
Presteer 'n 2-manier of 3-manier saamsmelt op die gegewe profiele
|
|
Translated and reviewed by
Bernard Stafford
|
|
|
|
Located in
../aa-mergeprof:29
|
|
|
22.
|
|
|
your profile
|
|
|
|
|
jou profiel
|
|
Translated and reviewed by
Bernard Stafford
|
|
|
|
Located in
../aa-mergeprof:31
|
|
|
23.
|
|
|
base profile
|
|
|
|
|
base profiel
|
|
Translated and reviewed by
Bernard Stafford
|
|
|
|
Located in
../aa-mergeprof:32
|
|
|
24.
|
|
|
other profile
|
|
|
|
|
ander profiel
|
|
Translated and reviewed by
Bernard Stafford
|
|
|
|
Located in
../aa-mergeprof:33
|
|
|
25.
|
|
|
The following local profiles were changed. Would you like to save them?
|
|
|
|
|
Die volgende plaaslike profiele is verander. Wil jy hulle red?
|
|
Translated and reviewed by
Bernard Stafford
|
|
|
|
Located in
../aa-mergeprof:67 ../apparmor/aa.py:2345
|
|
|
26.
|
|
|
Path
|
|
|
|
|
Pad
|
|
Translated and reviewed by
Bernard Stafford
|
|
|
|
Located in
../aa-mergeprof:148 ../aa-mergeprof:430 ../apparmor/aa.py:1767
|
|
|
27.
|
|
|
Select the appropriate mode
|
|
|
|
|
Kies die toepaslike modus
|
|
Translated and reviewed by
Bernard Stafford
|
|
|
|
Located in
../aa-mergeprof:149
|
|
|
28.
|
|
|
Unknown selection
|
|
|
|
|
Onbekend seleksie
|
|
Translated and reviewed by
Bernard Stafford
|
|
|
|
Located in
../aa-mergeprof:166
|
|
|
29.
|
|
|
File includes
|
|
|
|
|
Lêer sluit in
|
|
Translated and reviewed by
Bernard Stafford
|
|
|
|
Located in
../aa-mergeprof:183 ../aa-mergeprof:209
|
|
|
30.
|
|
|
Select the ones you wish to add
|
|
|
|
|
Seleksie die wat jy wil byvoeg
|
|
Translated and reviewed by
Bernard Stafford
|
|
|
|
Located in
../aa-mergeprof:183 ../aa-mergeprof:209
|
