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"
2025-03-10 20:58:18 +03:00 · 2021-08-31 01:29:24 +00:00 · 2021-08-31 01:29:24 +00:00 · d47f01a499
commit d47f01a499
parent 596a184fa1
3 changed files with 3 additions and 0 deletions
--- a/app/lattedock.notifyrc
+++ b/app/lattedock.notifyrc
@ -187,6 +187,7 @@ Name[eu]=Huts egin du esportatzea
 Name[fi]=Vienti epäonnistui
 Name[fr]=Exportation impossible
 Name[gl]=Non se puido exportar
+Name[ia]=Falleva a exportar
 Name[id]=Gagal mengekspor
 Name[it]=Impossibile esportare
 Name[ko]=내보내지 못했습니다
--- a/app/org.kde.latte-dock.desktop.cmake
+++ b/app/org.kde.latte-dock.desktop.cmake
@ -16,6 +16,7 @@ Name[eu]=Latte
 Name[fi]=Latte
 Name[fr]=Latte
 Name[gl]=Latte
+Name[ia]=Latte
 Name[id]=Latte
 Name[it]=Latte
 Name[ko]=Latte
--- a/indicators/default/metadata.desktop
+++ b/indicators/default/metadata.desktop
@ -16,6 +16,7 @@ Name[eu]=Latte
 Name[fi]=Latte
 Name[fr]=Latte
 Name[gl]=Latte
+Name[ia]=Latte
 Name[id]=Latte
 Name[it]=Latte
 Name[ko]=Latte