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-10-02 05:00:54 +02:00
parent 7ca06a74ae
commit 8baad25d47
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

@ -169,6 +169,7 @@ Keywords[es]=partición;disco;
Keywords[id]=partisi;disk;
Keywords[it]=partizione;disco;
Keywords[nl]=partitie;schijf
Keywords[pl]=partycja;dysk;
Keywords[pt]=partição;disco;
Keywords[sr]=partition;disk;партиција;диск;
Keywords[sr@ijekavian]=partition;disk;партиција;диск;