andrius
/
kpmcore
1
0
Fork 0
Code Pull Requests Releases Activity

SVN_SILENT made messages (.desktop file) - always resolve ours 

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
This commit is contained in:
l10n daemon script 2018-08-07 05:44:32 +02:00
parent 29dcd08e70
commit b0663ba1b5
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/util/org.kde.kpmcore.externalcommand.actions
View File

@ -18,6 +18,7 @@ Name[x-test]=xxStart external command daemonxx
Description=Administrative privileges are required to manage disks
Description[ca]=Es requereixen privilegis d'administrador per gestionar discs
Description[ca@valencia]=Es requereixen privilegis d'administrador per gestionar discs
Description[es]=Se necesitan permisos de administrador para gestionar discos
Description[fi]=Levyjen hallinta vaatii pääkäyttäjäoikeuksia
Description[lt]=Diskų tvarkymui reikalingos administratoriaus teisės
Description[nl]=Er zijn administratieve rechten vereist om schijven te beheren