Commit baf2e8f7 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 6c8eb3c8
......@@ -30,6 +30,7 @@ Comment[pl]=Kdenlive
Comment[pt]=Kdenlive
Comment[pt_BR]=Kdenlive
Comment[ro]=Kdenlive
Comment[ru]=Kdenlive
Comment[sk]=Kdenlive
Comment[sl]=Kdenlive
Comment[sv]=Kdenlive
......@@ -342,6 +343,7 @@ Name[pl]=Błąd
Name[pt]=Erro
Name[pt_BR]=Erro
Name[ro]=Eroare
Name[ru]=Ошибка
Name[sk]=Chyba
Name[sl]=Napaka
Name[sv]=Fel
......@@ -380,6 +382,7 @@ Comment[pl]=Wystąpił błąd w Kdenlive
Comment[pt]=Ocorreu um erro no Kdenlive
Comment[pt_BR]=Ocorreu um erro no Kdenlive
Comment[ro]=În Kdenlive a intervenit o eroare
Comment[ru]=В Kdenlive произошла ошибка
Comment[sk]=Nastala chyba v Kdenlive
Comment[sl]=V Kdenlive je prišlo do napake
Comment[sv]=Ett fel uppstod i Kdenlive
......
......@@ -30,6 +30,7 @@ Name[pl]=Kdenlive
Name[pt]=Kdenlive
Name[pt_BR]=Kdenlive
Name[ro]=Kdenlive
Name[ru]=Kdenlive
Name[sk]=Kdenlive
Name[sl]=Kdenlive
Name[sv]=Kdenlive
......@@ -69,6 +70,7 @@ GenericName[pl]=Edytor wideo
GenericName[pt]=Editor de Vídeo
GenericName[pt_BR]=Editor de Vídeo
GenericName[ro]=Redactor de imagini
GenericName[ru]=Видеоредактор
GenericName[sk]=Editor videa
GenericName[sl]=Urejevalnik videa
GenericName[sv]=Videoeditor
......@@ -106,6 +108,7 @@ Comment[pl]=Nieliniowy edytor wideo dla KDE
Comment[pt]=Editor de vídeo não-linear para o KDE
Comment[pt_BR]=Editor de vídeo não-linear para o KDE
Comment[ro]=Redactor de imagini neliniar pentru KDE
Comment[ru]=Нелинейный видеоредактор от KDE
Comment[sk]=Nelineárny editor videa pre KDE
Comment[sl]=Ne-linearni urejevalnik videa za KDE
Comment[sv]=Icke-linjär videoeditor för KDE
......
......@@ -28,6 +28,7 @@ Name[pl]=Lista odtwarzania MLT
Name[pt]=Lista de Reprodução MLT
Name[pt_BR]=Lista de Reprodução MLT
Name[ro]=Listă de redare MLT
Name[ru]=Список воспроизведения MLT
Name[sk]=Zoznam skladieb MLT
Name[sl]=Seznam predvajanja MLT
Name[sv]=MLT-spellista
......
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