Commit a8a7412b 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 001a0296
Pipeline #187924 skipped
......@@ -60,7 +60,7 @@ Description=Use the default window background color.
Description[ar]=استعمل لون خلفيّة النّافذة المبدئي.
Description[bs]=Podrazumijevana boja pozadine prozora
Description[ca]=Usa el color de fons predeterminat de la finestra.
Description[ca@valencia]=Utilitza el color de fons predeterminat de la finestra.
Description[ca@valencia]=Utilisa el color de fons predeterminat de la finestra.
Description[da]=Brug standard baggrundsfarve for vinduer.
Description[de]=Die Standard-Hintergrundfarbe des Fensters verwenden.
Description[el]=Χρήση του προκαθορισμένου χρώματος φόντου παραθύρου
......
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