Commit fa94c8ea authored by Script Kiddy's avatar Script Kiddy

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 54fdc4f5
......@@ -12,6 +12,7 @@
"Name[pt]": "Mudar a Capitalização",
"Name[pt_BR]": "Alterar maiúsculas e minúsculas",
"Name[sk]": "Zmeniť veľkosť písmen",
"Name[sl]": "Spremeni velikost črk",
"Name[sr@ijekavian]": "Промени величину слова",
"Name[sr@ijekavianlatin]": "Promeni veličinu slova",
"Name[sr@latin]": "Promeni veličinu slova",
......
......@@ -11,6 +11,7 @@
"Name[pt]": "Ampliar o Texto",
"Name[pt_BR]": "Ampliar o texto",
"Name[sk]": "Priblížiť text",
"Name[sl]": "Približaj besedilo",
"Name[sr@ijekavian]": "Увеличај текст",
"Name[sr@ijekavianlatin]": "Uveličaj tekst",
"Name[sr@latin]": "Uveličaj tekst",
......
{
"KPlugin": {
"Name": "Expand URL",
"Name": "Expand URL",
"ServiceTypes": [
"MessageViewer/ViewerCommonPlugin"
],
"Version": "1.0"
}
}
}
\ No newline at end of file
......@@ -29,4 +29,4 @@
],
"Version": "1.0"
}
}
}
\ No newline at end of file
......@@ -9,6 +9,8 @@
"Name[pl]": "Nie śledź",
"Name[pt]": "Não Seguir",
"Name[pt_BR]": "Não rastrear",
"Name[sk]": "Nesledovať",
"Name[sl]": "Ne sledi mi",
"Name[sr@ijekavian]": "Не прати ме",
"Name[sr@ijekavianlatin]": "Ne prati me",
"Name[sr@latin]": "Ne prati me",
......
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