Commit 0df14bf8 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 8d855ba4
......@@ -15,6 +15,7 @@
"Description[nn]": "Integrer KIO-gdrive",
"Description[pt]": "Integração do GDrive no KIO",
"Description[pt_BR]": "Integra o KIO gdrive",
"Description[sl]": "Integriraj KIO gdrive",
"Description[sv]": "Integrera KIO gdrive",
"Description[uk]": "Інтеграція із KIO gdrive",
"Description[x-test]": "xxIntegrate KIO gdrivexx",
......@@ -38,6 +39,7 @@
"Name[nn]": "KIO-gdrive",
"Name[pt]": "KIO do GDrive",
"Name[pt_BR]": "KIO gdrive",
"Name[sl]": "KIO gdrive",
"Name[sv]": "KIO gdrive",
"Name[uk]": "KIO GDrive",
"Name[x-test]": "xxKIO gdrivexx",
......
......@@ -24,6 +24,7 @@
"Name[pt_BR]": "Ação 'Copiar URL do Google para a área de transferência'",
"Name[ru]": "Действие «Скопировать адрес на Google Диск в буфер обмена»",
"Name[sk]": "Akcia 'Kopírovať Google URL do schránky'",
"Name[sl]": "Dejanje 'Kopiraj Google URL v odložišče'",
"Name[sv]": "Åtgärden 'Kopiera Google webbadress till klippbordet'",
"Name[uk]": "Дія «Копіювати адресу Google до буфера обміну»",
"Name[x-test]": "xx'Copy Google URL to clipboard' actionxx",
......
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