Skip to content

Commit

Permalink
SVN_SILENT made messages (.desktop file) - always resolve ours
Browse files Browse the repository at this point in the history
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"
  • Loading branch information
l10n daemon script committed Oct 3, 2019
1 parent 080f5c1 commit f5e2e1d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions liquidshell-session.desktop
Expand Up @@ -16,6 +16,7 @@ Name[fr]=Liquidshell
Name[gl]=Liquidshell
Name[it]=Liquidshell
Name[ko]=Liquidshell
Name[lt]=Liquidshell
Name[nl]=Liquidshell
Name[pl]=Liquidshell
Name[pt]=Liquidshell
Expand Down
4 changes: 4 additions & 0 deletions liquidshell.notifyrc
Expand Up @@ -15,6 +15,7 @@ Name[fr]=Mises à jour disponibles
Name[gl]=Actualizacións dispoñíbeis
Name[it]=Aggiornamenti disponibili
Name[ko]=업데이트 사용 가능
Name[lt]=Yra prieinami atnaujinimai
Name[nl]=Elementen voor bijwerken beschikbaar
Name[pl]=Dostępne uaktualnienia
Name[pt]=Actualizações disponíveis
Expand All @@ -41,6 +42,7 @@ Name[fr]=Erreur lors de la mise à jour
Name[gl]=Erro de actualización
Name[it]=Errore nell'aggiornamento
Name[ko]=업데이트 오류
Name[lt]=Atnaujinimo klaida
Name[nl]=Fout tijdens bijwerken
Name[pl]=Błąd uaktualnienia
Name[pt]=Erro de actualização
Expand All @@ -66,6 +68,7 @@ Name[fr]=Redémarrage nécessaire
Name[gl]=Requírese reiniciar
Name[it]=Riavvio necessario
Name[ko]=다시 시작 필요함
Name[lt]=Reikia paleisti kompiuterį iš naujo
Name[nl]=Herstart vereist
Name[pl]=Wymagane ponowne uruchomienie
Name[pt]=Reinício necessário
Expand All @@ -91,6 +94,7 @@ Name[fr]=L'appareil a besoin d'être rechargé
Name[gl]=Un dispositivo necesita cargarse
Name[it]=Il dispositivo ha bisogno di essere ricaricato
Name[ko]=충전이 필요함
Name[lt]=Reikia įkrauti įrenginį
Name[nl]=Apparaat moet opgeladen worden
Name[pl]=Urządzenie wymaga ładowania
Name[pt]=O dispositivo necessita de carga
Expand Down
1 change: 1 addition & 0 deletions org.kde.liquidshell.desktop
Expand Up @@ -14,6 +14,7 @@ Name[fr]=Espace de travail du bureau Liquid
Name[gl]=Espazo de traballo de escritorio Liquid
Name[it]=Spazio di lavoro Liquid Desktop
Name[ko]=Liquid 데스크톱 작업 공간
Name[lt]=Liquid darbalaukio darbo sritis
Name[nl]=Liquid bureaubladwerkruimte
Name[pl]=Płynna przestrzeń pracy pulpitu
Name[pt]=Área de Trabalho Liquid
Expand Down

0 comments on commit f5e2e1d

Please sign in to comment.