Commit 8b8c342a 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 d0d552d6
Pipeline #201071 skipped
......@@ -38,7 +38,7 @@ Comment=Chrome like theme for Falkon based on Firefox Chromifox theme
Comment[az]=Falkon üçün Firefox Chromifox mövzusuna əsaslanan Chrome mövzusu
Comment[bg]=Тема подобна на Chrome, базирана на Chromifox за Firefox
Comment[ca]=Tema semblant al Chrome pel Falkon, basat en el tema Chromifox del Firefox
Comment[ca@valencia]=Tema semblant al Chrome per Falkon, basat en el tema Chromifox de Firefox
Comment[ca@valencia]=Tema pareixent a Chrome per a Falkon, basat en el tema Chromifox de Firefox
Comment[cs]=Motiv pro Falkon podobný Chrome založený na motivu Firefox Chromifox
Comment[da]=Chrome-lignende tema til Falkon baseret på Firefox Chromifox-tema
Comment[de]=Chrome ähnliches Design für Falkon auf der Basis des Chromifox-Designs von Firefox
......
......@@ -38,7 +38,7 @@ Comment=Mac like theme for Falkon based on Firefox Mac OS X theme
Comment[az]=Falkon üçün Firefox Mac OS X mövzusuna əsaslanan Mac mövzusu
Comment[bg]=Тема подобна на Mac, базирана на Firefox Mac OS X
Comment[ca]=Tema semblant al Mac pel Falkon, basat en el tema Mac OS X del Firefox
Comment[ca@valencia]=Tema semblant al Mac per Falkon, basat en el tema Mac OS X de Firefox
Comment[ca@valencia]=Tema pareixent a Mac per a Falkon, basat en el tema Mac OS X de Firefox
Comment[cs]=Motiv pro Falkon podobný Macu založený na motivu Firefox Mac OS X
Comment[da]=Mac-lignende tema til Falkon baseret på Firefox Mac OS X-tema
Comment[de]=Mac ähnliches Design für Falkon auf der Basis des „Mac OS X“-Designs von Firefox
......
......@@ -38,7 +38,7 @@ Comment=Windows like theme based on Material design
Comment[az]=Material dizaynında Windows oxşarı mövzu
Comment[bg]=Тема подобна на Windows, базирана на Material design
Comment[ca]=Tema semblant al Windows, basat en el «Material design»
Comment[ca@valencia]=Tema semblant a Windows, basat en «Material design»
Comment[ca@valencia]=Tema pareixent a Windows, basat en «Material design»
Comment[cs]=Motiv podobný Windows založený na designu Material
Comment[da]=Windows-lignende tema baseret på Material design
Comment[de]=Windows ähnliches Design auf der Basis des Designs Material
......
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