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"
KDE · Sep 20, 2020 · e18d156 · e18d156
1 parent dc61a97
commit e18d156
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/themes/kmines_waste2.desktop b/themes/kmines_waste2.desktop
@@ -2,6 +2,7 @@
 Name=Cig Waste No. 2
 Name[ca]=Neteja de burilles núm. 2
 Name[ca@valencia]=Neteja de burilles núm. 2
+Name[el]=Cig Waste No. 2
 Name[en_GB]=Cig Waste No. 2
 Name[es]=Contenedor de residuos núm. 2
 Name[eu]=Zigarro hondakinak zk. 2
@@ -20,6 +21,7 @@ Name[x-test]=xxCig Waste No. 2xx
 Description=The cleaning of the Earth begins
 Description[ca]=Ha començat la neteja de la Terra
 Description[ca@valencia]=Ha començat la neteja de la Terra
+Description[el]=Ο καθαρισμός της Γης ξεκινάει
 Description[en_GB]=The cleaning of the Earth begins
 Description[es]=La limpieza de la Tierra comienza
 Description[eu]=Lurraren garbiketa hasten da