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"
This commit is contained in:
parent
b50f747876
commit
de4e429aed
2 changed files with 4 additions and 0 deletions
|
@ -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[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
|
||||
Comment[ko]=창이 전체 화면 모드로 진입하거나 벗어날 때 사용할 애니메이션
|
||||
|
@ -23,6 +24,7 @@ Name[cs]=Celá obrazovka
|
|||
Name[de]=Vollbild
|
||||
Name[en_GB]=Full Screen
|
||||
Name[es]=Pantalla completa
|
||||
Name[eu]=Pantaila-betea
|
||||
Name[fr]=Plein écran
|
||||
Name[ia]=Schermo plen
|
||||
Name[it]=Schermo intero
|
||||
|
|
|
@ -294,6 +294,7 @@ Name[az]=Xwayland Qəzası
|
|||
Name[ca]=Fallada de l'Xwayland
|
||||
Name[en_GB]=Xwayland Crash
|
||||
Name[es]=Fallo de Xwayland
|
||||
Name[eu]=Xwayland kraskatzea
|
||||
Name[fr]=Plantage « Xwayland »
|
||||
Name[it]=Chiusura inattesa di Xwayland
|
||||
Name[ko]=Xwayland 충돌
|
||||
|
@ -313,6 +314,7 @@ Comment[ca]=L'Xwayland ha fallat
|
|||
Comment[cs]=Xwayland spadnul
|
||||
Comment[en_GB]=Xwayland has crashed
|
||||
Comment[es]=Xwayland ha fallado
|
||||
Comment[eu]=Xwayland kraskatu egin da
|
||||
Comment[fr]=Plantage de « Xwayland »
|
||||
Comment[it]=Xwayland è stato terminato in modo inatteso
|
||||
Comment[ko]=Xwayland가 충돌함
|
||||
|
|
Loading…
Reference in a new issue