Commit f7292985 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 d56951d8
......@@ -12,6 +12,7 @@ Name[nl]=Buho
Name[pt]=Buho
Name[pt_BR]=Buho
Name[sk]=Buho
Name[sl]=Buho
Name[sv]=Buho
Name[uk]=Буго
Name[x-test]=xxBuhoxx
......@@ -29,6 +30,7 @@ Comment[nl]=Hulpprogramma voor het maken van notities
Comment[pt]=Aplicação de bloco de notas
Comment[pt_BR]=Aplicativo de anotações
Comment[sk]=Aplikácia na poznámky
Comment[sl]=Program za beleženje opomb
Comment[sv]=Anteckningsprogram
Comment[uk]=Програма для роботи із нотатками
Comment[x-test]=xxNote taking appxx
......@@ -47,6 +49,7 @@ Keywords[ko]=notes;todo;nextcloud;maui;노트;메모;할 일;
Keywords[nl]=notities;tedoen;nextcloud;maui;
Keywords[pt]=notas;tarefas;nextcloud;maui;
Keywords[pt_BR]=notas;tarefa;nextcloud;maui;anotações;
Keywords[sl]=notes;todo;nextcloud;maui;opombe;narediti;
Keywords[sv]=anteckningar;uppgifter;nextcloud;maui;
Keywords[uk]=notes;todo;nextcloud;maui;нотатки;завдання;записи;некстклауд;мауї;
Keywords[x-test]=xxnotesxx;xxtodoxx;xxnextcloudxx;xxmauixx;
......@@ -70,6 +73,7 @@ GenericName[nl]=Notitieboekje
GenericName[pt]=Bloco de Notas
GenericName[pt_BR]=Bloco de Notas
GenericName[sk]=Ukladanie poznámok
GenericName[sl]=Prejemnik opomb
GenericName[sv]=Anteckningsblock
GenericName[uk]=Записна книжка
GenericName[x-test]=xxNote Takerxx
......
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