Commit 25ae1228 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 91daa127
[Desktop Entry] [Desktop Entry]
Name=Example Name=Example
Name[ca]=Exemple
Name[gl]=Exemplo
Name[nl]=Voorbeeld
Name[pt_BR]=Exemplo
Name[uk]=Приклад
Name[x-test]=xxExamplexx
Description=Example theme for header. Description=Example theme for header.
Description[ca]=Tema d'exemple per a la capçalera.
Description[gl]=Tema de exemplo para a cabeceira.
Description[nl]=Voorbeeld van thema voor kop.
Description[pt_BR]=Exemplo de tema para o cabeçalho.
Description[uk]=Приклад теми для заголовка.
Description[x-test]=xxExample theme for header.xx
FileName=header.html FileName=header.html
[Desktop Entry] [Desktop Entry]
Name=Example fancy Name=Example fancy
Name[ca]=Exemple sofisticat
Name[gl]=Exemplo elegante
Name[nl]=Voorbeeld van elegant
Name[pt_BR]=Exemplo bonito
Name[uk]=Приклад вишуканого
Name[x-test]=xxExample fancyxx
Description=Create fancy theme with grantlee. Description=Create fancy theme with grantlee.
Description[ca]=Crea un tema sofisticat amb grantlee.
Description[gl]=Crear un tema elegante con Grantlee.
Description[nl]=Elegant thema maken met grantlee.
Description[pt_BR]=Cria um tema bonito com o Grantlee.
Description[uk]=Створити складну тему за допомогою grantlee.
Description[x-test]=xxCreate fancy theme with grantlee.xx
FileName=header.html FileName=header.html
DisplayExtraVariables=Sender,List-Id DisplayExtraVariables=Sender,List-Id
...@@ -9,6 +9,10 @@ ...@@ -9,6 +9,10 @@
"Name[pt]": "Enviar os vCard's", "Name[pt]": "Enviar os vCard's",
"Name[pt_BR]": "Enviar vCards", "Name[pt_BR]": "Enviar vCards",
"Name[sk]": "Poslať vCard", "Name[sk]": "Poslať vCard",
"Name[sr@ijekavian]": "Пошаљи в‑кардове",
"Name[sr@ijekavianlatin]": "Pošalji vCardove",
"Name[sr@latin]": "Pošalji vCardove",
"Name[sr]": "Пошаљи в‑кардове",
"Name[sv]": "Skicka visitkort", "Name[sv]": "Skicka visitkort",
"Name[uk]": "Надсилання візитівок", "Name[uk]": "Надсилання візитівок",
"Name[x-test]": "xxSend vCardsxx", "Name[x-test]": "xxSend vCardsxx",
......
{ {
"KPlugin": { "KPlugin": {
"Name": "ROT13", "Name": "ROT13",
"Name[sr@ijekavian]": "Рот‑13",
"Name[sr@ijekavianlatin]": "Rot‑13",
"Name[sr@latin]": "Rot‑13",
"Name[sr]": "Рот‑13",
"Name[x-test]": "xxROT13xx", "Name[x-test]": "xxROT13xx",
"ServiceTypes": [ "ServiceTypes": [
"KMailEditor/Plugin" "KMailEditor/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