Commit b1a115aa 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 c50acc01
......@@ -3,6 +3,7 @@
Name=Windows
Name[az]=Pəncərələr
Name[ca]=Finestres
Name[cs]=Okna
Name[en_GB]=Windows
Name[es]=Ventanas
Name[fr]=Fenêtres
......@@ -21,6 +22,7 @@ Name[x-test]=xxWindowsxx
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[cs]=Seznam oken a ploch k přepínání
Comment[en_GB]=List windows and desktops and switch them
Comment[es]=Listar ventanas y escritorios y cambiar entre ellos
Comment[fr]=Lister les fenêtres et les bureaux pour pouvoir passer de l'un à l'autre.
......
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