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 2020-12-30 10:13:31 +01:00
parent 01f8571bf6
commit 1ce1034bf4
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

@ -181,6 +181,7 @@ Keywords[eu]=partizioa;diskoa;
Keywords[fi]=osio;levy;
Keywords[fr]=partition;disque;
Keywords[gl]=partition;disk;partición;disco;
Keywords[hu]=partíció;lemez;
Keywords[id]=partisi;disk;
Keywords[it]=partizione;disco;
Keywords[ko]=partition;disk;파티션;디스크;