kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-01-12 01:17:55 +03:00
Code Issues Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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"
This commit is contained in:
l10n daemon script 2019-04-14 05:47:29 +02:00
parent 1145a45420
commit 210674d67b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/lattedock.notifyrc
View File

@ -62,7 +62,7 @@ Name[gl]=Importouse correctamente
Name[it]=Importata con successo
Name[nl]=Met succes geïmporteerd
Name[pt]=Importado com sucesso
Name[sv]=Importerade med lyckat resultat
Name[sv]=Import lyckades
Name[uk]=Успішно імпортовано
Name[x-test]=xxImported successfullyxx
Action=Popup
@ -94,7 +94,7 @@ Name[gl]=Exportouse correctamente
Name[it]=Esportata correttamente
Name[nl]=Met succes geëxporteerd
Name[pt]=Exportada com sucesso
Name[sv]=Exporterade med lyckat resultat
Name[sv]=Export lyckades
Name[uk]=Успішно експортовано
Name[x-test]=xxExported successfullyxx
Action=Popup
@ -126,6 +126,7 @@ Name[gl]=Retirouse correctamente
Name[it]=Rimossa con successo
Name[nl]=Met succes verwijderd
Name[pt]=Removido com sucesso
Name[sv]=Borttagning lyckades
Name[uk]=Успішно вилучено
Name[x-test]=xxRemoved successfullyxx
Action=Popup
@ -141,6 +142,7 @@ Name[gl]=Non se puido retirar
Name[it]=Impossibile rimuovere
Name[nl]=Verwijderen is mislukt
Name[pt]=Não foi possível remover
Name[sv]=Misslyckades ta bort
Name[uk]=Не вдалося вилучити
Name[x-test]=xxFailed to removexx
Action=Popup