mirror of
https://invent.kde.org/network/kdeconnect-kde.git
synced 2025-10-06 00:32:40 +02:00
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:
@@ -1038,6 +1038,7 @@ Name=Error
|
||||
Name[bg]=Грешка
|
||||
Name[ca]=Error
|
||||
Name[ca@valencia]=S'ha produït un error
|
||||
Name[cs]=Chyba
|
||||
Name[es]=Error
|
||||
Name[eu]=Errorea
|
||||
Name[fr]=Erreur
|
||||
|
Reference in New Issue
Block a user