andrius
/
partitionmanager
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-05 05:29:35 +02:00
parent a4773460f0
commit 37ebbd46ab
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/org.kde.partitionmanager.desktop
View File

@ -168,6 +168,7 @@ Keywords[de]=partition;disk;festplatte
Keywords[el]=κατάτμηση;δίσκος;
Keywords[en_GB]=partition;disk;
Keywords[es]=partición;disco;
Keywords[fi]=osio;levy;
Keywords[fr]=partition;disque;
Keywords[gl]=partition;disk;partición;disco;
Keywords[id]=partisi;disk;