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"
GIT_SILENT made messages (after extraction)
2019-04-23 06:06:30 +02:00 · 2019-04-23 03:19:13 +02:00
2 changed files with 7 additions and 1 deletions
--- a/src/org.kde.partitionmanager.appdata.xml
+++ b/src/org.kde.partitionmanager.appdata.xml
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@ -37,7 +37,7 @@ Name[pl]=Zarządzanie partycjami
 Name[pt]=Gestor de Partições do KDE
 Name[pt_BR]=Gerenciador de partições do KDE
 Name[ro]=Gestionarul de partiții KDE
-Name[ru]=Диспетчер разделов для KDE
+Name[ru]=Диспетчер разделов от KDE
 Name[sk]=KDE Správca partícií
 Name[sl]=Upravljalnik razdelkov za KDE
 Name[sr]=КДЕ‑ов менаџер партиција
@ -181,6 +181,7 @@ Keywords[nn]=partisjon;disk;
 Keywords[pl]=partycja;dysk;
 Keywords[pt]=partição;disco;
 Keywords[pt_BR]=partição;disco;
+Keywords[ru]=раздел;диск;
 Keywords[sl]=razdelek;particija;disk;
 Keywords[sr]=partition;disk;партиција;диск;
 Keywords[sr@ijekavian]=partition;disk;партиција;диск;
Author	SHA1	Message	Date
l10n daemon script	0403d5cf4a	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"	2019-04-23 06:06:30 +02:00
l10n daemon script	bfd12a1ba1	GIT_SILENT made messages (after extraction)	2019-04-23 03:19:13 +02:00