mirror of
https://invent.kde.org/network/kdeconnect-kde.git
synced 2025-12-12 20:35:55 +01: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:
@@ -1045,6 +1045,7 @@ Name[eu]=Errorea
|
||||
Name[fi]=Virhe
|
||||
Name[fr]=Erreur
|
||||
Name[he]=שגיאה
|
||||
Name[hu]=Hiba
|
||||
Name[it]=Errore
|
||||
Name[ka]=შეცდომა
|
||||
Name[ko]=오류
|
||||
|
||||
Reference in New Issue
Block a user