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 2016-07-29 09:28:55 +00:00
parent a8b35c56a3
commit c30a83a5b9
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/plugins/libparted/helpers/org.kde.kpmcore.scan.actions
View File

@ -57,6 +57,7 @@ Name[uk]=Дія із визначення типу файлової систем
Name[x-test]=xxDetect file system type actionxx
Description=Detect file system type
Description[ca]=Detecta el tipus de sistema de fitxers
Description[de]=Dateisystemtyp erkennen
Description[nl]=Type bestandssysteem detecteren
Description[pt]=Detectar o tipo de sistema de ficheiros
Description[sl]=Zaznaj vrsto datotečnega sistema