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"
master
l10n daemon script 2020-09-27 06:07:58 +02:00
parent e534d5abad
commit 25b93b4ccc
2 changed files with 4 additions and 0 deletions

View File

@ -1,6 +1,7 @@
[Desktop Entry]
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[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
@ -18,6 +19,7 @@ Icon=preferences-system-windows-effect-fullscreen
Name=Full Screen
Name[ca]=Pantalla completa
Name[cs]=Celá obrazovka
Name[en_GB]=Full Screen
Name[es]=Pantalla completa
Name[fr]=Plein écran
Name[ia]=Schermo plen

View File

@ -292,6 +292,7 @@ Action=Popup
Name=Xwayland Crash
Name[az]=Xwayland Qəzası
Name[ca]=Fallada de l'Xwayland
Name[en_GB]=Xwayland Crash
Name[es]=Fallo de Xwayland
Name[fr]=Plantage « Xwayland »
Name[it]=Chiusura inattesa di Xwayland
@ -309,6 +310,7 @@ Comment=Xwayland has crashed
Comment[az]=Xwayland qəzaya uğradı
Comment[ca]=L'Xwayland ha fallat
Comment[cs]=Xwayland spadnul
Comment[en_GB]=Xwayland has crashed
Comment[es]=Xwayland ha fallado
Comment[fr]=Plantage de « Xwayland »
Comment[it]=Xwayland è stato terminato in modo inatteso