Commit acc3c7b9 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 5738c83f
Pipeline #46567 skipped
......@@ -25,6 +25,7 @@ Name[ia]=Responsa de usator
Name[it]=UserFeedback
Name[ko]=사용자 피드백
Name[nl]=UserFeedBack
Name[pl]=Informacja Zwrotna Użytkownika
Name[pt]=UserFeedBack
Name[pt_BR]=Comentários do usuário
Name[ru]=UserFeedBack
......@@ -45,6 +46,7 @@ Comment[ia]=Configuration de Responsa de usator de KOrganizer
Comment[it]=Configurazione UserFeedBack di KOrganizer
Comment[ko]=KOrganizer 사용자 피드백 설정
Comment[nl]=KOrganizer UserFeedBack configuratie
Comment[pl]=Ustawienia informacji zwrotnej użytkownika dla KOrganizera
Comment[pt]=Configuração das Reacções dos Utilizadores do KOrganizer
Comment[pt_BR]=Configuração dos comentários do usuário do KOrganizer
Comment[ru]=Настройка параметров обратной связи KOrganizer
......@@ -65,6 +67,7 @@ X-KDE-Keywords[ia]=korganizer, userfeedback
X-KDE-Keywords[it]=korganizer,userfeedback
X-KDE-Keywords[ko]=korganizer,userfeedback,사용자 피드백
X-KDE-Keywords[nl]=korganizer,userfeedback
X-KDE-Keywords[pl]=korganizer,informacja zwrotna użytkownika
X-KDE-Keywords[pt]=korganizer,reacções,utilizadores
X-KDE-Keywords[pt_BR]=korganizer,comentários do usuario
X-KDE-Keywords[ru]=korganizer,userfeedback,органайзер,обратная связь
......
......@@ -120,7 +120,7 @@ Name[ne]=केडीई आयोजक
Name[nl]=KOrganizer
Name[nn]=KOrganizer
Name[pa]=ਕੇ-ਪਰਬੰਧਕ
Name[pl]=KOrganizator
Name[pl]=KOrganizer
Name[pt]=KOrganizer
Name[pt_BR]=KOrganizer
Name[ro]=Organizator
......
......@@ -13,6 +13,7 @@ Name[fr]=Vue KOrganizer
Name[ia]=Korganizer vista
Name[it]=Vista di KOrganizer
Name[nl]=Beeld KOrganizer
Name[pl]=Widok KOrganizerera
Name[pt]=Área do KOrganizer
Name[pt_BR]=Visualização do KOrganizer
Name[sl]=Pogled KOrganizerja
......@@ -31,6 +32,7 @@ Comment[fr]=Afficher de l'incidence spécifiée par l'URL
Comment[ia]=Monstra incidentia specificate per URL
Comment[it]=Mostra l'occorrenza indicata dall'URL
Comment[nl]=Toon URL van genoemd voorval
Comment[pl]=Wyświetl wystąpienie określone przez adres URL
Comment[pt]=Mostra o evento indicado pelo URL
Comment[pt_BR]=Mostrar incidência especificada pela URL
Comment[sl]=Prikazovanje pojavnosti, določeno z URL-jem
......
......@@ -118,7 +118,7 @@ Name[ne]=केडीई आयोजक
Name[nl]=KOrganizer
Name[nn]=KOrganizer
Name[pa]=ਕੇ-ਪਰਬੰਧਕ
Name[pl]=KOrganizator
Name[pl]=KOrganizer
Name[pt]=KOrganizer
Name[pt_BR]=KOrganizer
Name[ro]=Organizator
......
......@@ -120,7 +120,7 @@ Name[ne]=केडीई आयोजक
Name[nl]=KOrganizer
Name[nn]=KOrganizer
Name[pa]=ਕੇ-ਪਰਬੰਧਕ
Name[pl]=KOrganizator
Name[pl]=KOrganizer
Name[pt]=KOrganizer
Name[pt_BR]=KOrganizer
Name[ro]=Organizator
......
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