Compare commits

...

2 Commits

Author SHA1 Message Date
l10n daemon script 72cdc794df 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"
2020-02-06 05:38:22 +01:00
l10n daemon script c85809b372 GIT_SILENT made messages (after extraction) 2020-02-06 02:48:49 +01:00
2 changed files with 4 additions and 0 deletions

File diff suppressed because one or more lines are too long

View File

@ -183,6 +183,7 @@ Keywords[ko]=partition;disk;파티션;디스크;
Keywords[lt]=skaidinys;diskas;
Keywords[nl]=partitie;schijf;
Keywords[nn]=partisjon;disk;
Keywords[pa]=ਪਾਰਟੀਸ਼ਨ;ਡਿਸਕ;
Keywords[pl]=partycja;dysk;
Keywords[pt]=partição;disco;
Keywords[pt_BR]=partição;disco;