Commit 0f7c1306 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 13f14636
......@@ -354,6 +354,7 @@ Name[ca]=Captura la finestra sota el cursor
Name[ca@valencia]=Captura la finestra sota el cursor
Name[cs]=Zachytit okno pod kurzorem
Name[de]=Fenster unter dem Mauszeiger aufnehmen
Name[en_GB]=Capture Window Under Cursor
Name[es]=Capturar la ventana bajo el cursor
Name[fr]=Capturer la fenêtre sous le curseur
Name[ia]=Captura Fenestra sub Cursor
......
Markdown is supported
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