Commit 1754315d 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 d604cebf
...@@ -19,6 +19,7 @@ Name[nl]=Digitaal ...@@ -19,6 +19,7 @@ Name[nl]=Digitaal
Name[nn]=Digital Name[nn]=Digital
Name[pl]=Cyfrowy Name[pl]=Cyfrowy
Name[pt]=Digital Name[pt]=Digital
Name[ru]=Цифровой Name[ru]=Цифровой
Name[sk]=Digitálne Name[sk]=Digitálne
Name[sv]=Digitala Name[sv]=Digitala
...@@ -11,6 +11,7 @@ Name[nl]=Gummen ...@@ -11,6 +11,7 @@ Name[nl]=Gummen
Name[nn]=Viskelêr Name[nn]=Viskelêr
Name[pl]=Gumki Name[pl]=Gumki
Name[pt]=Apagadores Name[pt]=Apagadores
Name[sv]=Radering Name[sv]=Radering
Name[uk]=Гумки Name[uk]=Гумки
Name[x-test]=xxErasersxx Name[x-test]=xxErasersxx
...@@ -10,6 +10,7 @@ Name[fr]=★ Mes préférés ...@@ -10,6 +10,7 @@ Name[fr]=★ Mes préférés
Name[nl]=★ Mijn favorieten Name[nl]=★ Mijn favorieten
Name[pl]=★ Moje ulubione Name[pl]=★ Moje ulubione
Name[pt]=★ Os Meus Favoritos Name[pt]=★ Os Meus Favoritos
Name[pt_BR]=★ Meus favoritos
Name[sv]=★ Mina Favoriter Name[sv]=★ Mina Favoriter
Name[uk]=★ Мої улюблені Name[uk]=★ Мої улюблені
Name[x-test]=xx★ My Favoritesxx Name[x-test]=xx★ My Favoritesxx
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