Commit da310daa 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 42d948c9
......@@ -26,7 +26,7 @@ Name[lt]=Discover
Name[ml]=കണ്ടെത്തുക
Name[nl]=Ontdekken
Name[nn]=Discover
Name[pa]=ਖੋਜ
Name[pa]=ਡਿਸਕਵਰ
Name[pl]=Odkrywca
Name[pt]=Discover
Name[pt_BR]=Discover
......
......@@ -16,6 +16,7 @@ Name[ia]=Actualisationes de Software
Name[it]=Aggiornamenti software
Name[nl]=Elementen voor software bijwerken
Name[nn]=Program­oppdateringar
Name[pa]=ਸਾਫਟਵੇਅਰ ਅੱਪਡੇਟ ਹਨ
Name[pl]=Uaktualnienia oprogramowania
Name[pt]=Actualizações de Aplicações
Name[ru]=Обновления программ
......
......@@ -26,7 +26,7 @@ Name[lt]=Discover
Name[ml]=കണ്ടെത്തുക
Name[nl]=Ontdekken
Name[nn]=Discover
Name[pa]=ਖੋਜ
Name[pa]=ਡਿਸਕਵਰ
Name[pl]=Odkrywca
Name[pt]=Discover
Name[pt_BR]=Discover
......
......@@ -23,6 +23,7 @@ Name[ko]=Snap 로그인 동작
Name[lt]=Snap prisijungimo veiksmas
Name[nl]=Actie voor aanmelden van snap
Name[nn]=Snap-innloggingshandling
Name[pa]=ਸਨੈਪ ਲਾਗਇਨ ਕਾਰਵਾਈ
Name[pl]=Działanie logowania Snap
Name[pt]=Acção de autenticação do Snap
Name[pt_BR]=Ação de login do Snap
......
......@@ -28,7 +28,7 @@ Comment[lt]=Discover
Comment[ml]=കണ്ടെത്തുക
Comment[nl]=Ontdekken
Comment[nn]=Discover
Comment[pa]=ਖੋਜ
Comment[pa]=ਡਿਸਕਵਰ
Comment[pl]=Odkryj
Comment[pt]=Discover
Comment[pt_BR]=Discover
......
......@@ -26,7 +26,7 @@ Name[lt]=Discover
Name[ml]=കണ്ടെത്തുക
Name[nl]=Ontdekken
Name[nn]=Discover
Name[pa]=ਖੋਜ
Name[pa]=ਡਿਸਕਵਰ
Name[pl]=Odkrywca
Name[pt]=Discover
Name[pt_BR]=Discover
......
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