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-11-20 04:32:00 +01:00
parent f5d210adee
commit 7e29cf6c62
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,7 +111,7 @@ Comment[bs]=Upravljajte diskovima, particijama i datotečnim sistemima
Comment[ca]=Gestioneu discos, particions i sistemes de fitxers
Comment[ca@valencia]=Gestioneu discos, particions i sistemes de fitxers
Comment[cs]=Spravujte disky, oddíly a souborové systémy
Comment[da]=Håndterer diske, partitioner og filsystemer
Comment[da]=Håndtér diske, partitioner og filsystemer
Comment[de]=Verwaltung von Festplatten, Partitionen und Dateisystemen
Comment[el]=Διαχείριση δίσκων, κατατμήσεων και συστημάτων αρχείων
Comment[en_GB]=Manage disks, partitions and file systems
@ -163,6 +163,7 @@ Keywords=partition;disk;
Keywords[ca]=partició;disc;
Keywords[ca@valencia]=partició;disc;
Keywords[cs]=oddíl;disk;
Keywords[da]=partition;disk;
Keywords[de]=partition;disk;festplatte
Keywords[el]=κατάτμηση;δίσκος;
Keywords[es]=partición;disco;