Commit 88fc6f4a authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 5347492d
Pipeline #91105 skipped
......@@ -407,6 +407,7 @@ X-KDE-Shortcuts=Meta+Ctrl+Print
Name=Launch without taking a screenshot
Name[az]=Ekran şəkli çəkmədən başladın
Name[ca]=Llança sense prendre cap captura de pantalla
Name[ca@valencia]=Llança sense prendre cap captura de pantalla
Name[es]=Lanzar sin realizar una captura de pantalla
Name[fr]=Lancer sans réalisation de copie d'écran
Name[nl]=Starten zonder een schermafdruk te maken
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment