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 2017-12-11 04:38:36 +01:00
parent cc86c2dc5e
commit 26db2cfd8c
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org.kde.partitionmanager.desktop
View File

@ -170,6 +170,8 @@ Keywords[en_GB]=partition;disk;
Keywords[es]=partición;disco;
Keywords[id]=partisi;disk;
Keywords[it]=partizione;disco;
Keywords[ko]=partition;disk;파티션;디스크;
Keywords[lt]=skaidinys;diskas;
Keywords[nl]=partitie;schijf
Keywords[pl]=partycja;dysk;
Keywords[pt]=partição;disco;