Commit f5ee562f 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 74411356
......@@ -3,6 +3,7 @@ Comment=Animation for a window going to and leaving full screen mode
Comment[ca]=Animació per a una finestra que entra o abandona el mode de pantalla completa
Comment[en_GB]=Animation for a window going to and leaving full screen mode
Comment[es]=Animación para una ventana que entra en el modo de pantalla completa o sale de él
Comment[et]=Täisekraanirežiimi mineva või sealt väljuva akna animatsioon
Comment[eu]=Pantaila-osoko modutik/modura aldatzen den leiho baten animazioa
Comment[fr]=Animation pour une fenêtre basculant vers ou sortant du mode « Plein écran »
Comment[it]=Animazione per una finestra che entra e esce dalla modalità a schermo intero
......@@ -24,6 +25,7 @@ Name[cs]=Celá obrazovka
Name[en_GB]=Full Screen
Name[es]=Pantalla completa
Name[fr]=Plein écran
Name[it]=Schermo intero
......@@ -289,6 +289,7 @@ Name[az]=Xwayland Qəzası
Name[ca]=Fallada de l'Xwayland
Name[en_GB]=Xwayland Crash
Name[es]=Fallo de Xwayland
Name[et]=Xwaylandi krahh
Name[eu]=Xwayland kraskatzea
Name[fr]=Plantage « Xwayland »
Name[it]=Chiusura inattesa di Xwayland
......@@ -309,6 +310,7 @@ Comment[ca]=L'Xwayland ha fallat
Comment[cs]=Xwayland spadnul
Comment[en_GB]=Xwayland has crashed
Comment[es]=Xwayland ha fallado
Comment[et]=Xwayland lõpetas krahhiga
Comment[eu]=Xwayland kraskatu egin da
Comment[fr]=Plantage de « Xwayland »
Comment[it]=Xwayland è stato terminato in modo inatteso
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