Commit 916aeb14 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 3bd121a9
......@@ -5,7 +5,7 @@ Name[bs]=Stringovi
Name[ca]=Cadenes
Name[ca@valencia]=Cadenes
Name[cs]=Řetězce
Name[de]=Zeichenketten
Name[de]=Zeichenfolgen
Name[en_GB]=Strings
Name[es]=Cadenas
Name[et]=Stringid
......@@ -34,7 +34,7 @@ Comment=This plug-in adds many strings functions.
Comment[bs]=Ovaj servis daje mnoge stringovne funkcije.
Comment[ca]=Aquest connector afegeix moltes funcions de cadenes.
Comment[ca@valencia]=Aquest connector afig moltes funcions de cadenes.
Comment[de]=Ein Modul für viele Zeichenketten-Funktionen.
Comment[de]=Ein Modul für viele Zeichenfolgen-Funktionen.
Comment[en_GB]=This plug-in adds many strings functions.
Comment[es]=Este complemento añade muchas funciones de cadena.
Comment[et]=Paljusid stringifunktsioone lisav plugin.
......
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