Commit 2be28ac6 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 f790cca3
[Desktop Entry]
Comment=Animation for a window going to and leaving full screen mode
Comment[az]=Tam ekran rejiminə keçid və ondan çıxış pəncərəsi animasiyası
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
......@@ -23,6 +24,7 @@ Comment[x-test]=xxAnimation for a window going to and leaving full screen modexx
Name=Full Screen
Name[ast]=Pantalla completa
Name[az]=Tam Ekran
Name[ca]=Pantalla completa
Name[cs]=Celá obrazovka
......@@ -10,7 +10,7 @@ X-KDE-System-Settings-Parent-Category=desktopbehavior
Name=Touch Screen
Name[ast]=Pantalla táutil
Name[ast]=Pantalla táctil
Name[az]=Toxunma ekranı
Name[ca]=Pantalla tàctil
Name[ca@valencia]=Pantalla tàctil
[Desktop Entry]
# ctxt: plasma runner
......@@ -16,6 +17,7 @@ Name[sv]=Fönster
Comment=List windows and desktops and switch them
Comment[az]=Pəncərələrin, İş Masalarının siyahısı və onlar arası keçid
Comment[ca]=Llista finestres i escriptoris, i canvia entre ells
Comment[en_GB]=List windows and desktops and switch them
Comment[es]=Listar ventanas y escritorios y cambiar entre ellos
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