From 5614914d14dcb3af0819a7a75f16786d35ab50ea Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 12 Nov 2018 05:48:03 +0100 Subject: [PATCH] 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" --- src/plugins/StatusBarIcons/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/StatusBarIcons/metadata.desktop b/src/plugins/StatusBarIcons/metadata.desktop index b65f2ca28..ebc8cf304 100644 --- a/src/plugins/StatusBarIcons/metadata.desktop +++ b/src/plugins/StatusBarIcons/metadata.desktop @@ -32,7 +32,7 @@ Comment[es]=Añade iconos adicionales y control de zum a la barra de estado Comment[fi]=Lisää tilariville kuvakkeita ja lähennyssovelman Comment[fr]=Ajout d'icônes supplémentaires et d'un composant graphique de zoom à la barre d'état Comment[gl]=Engade iconas adicionais e un trebello de ampliación á barra de estado -Comment[id]=Menambah tambahan ikon dan perbesaran widget untuk bilah status +Comment[id]=Menambah tambahan ikon dan zum widget untuk bilah status Comment[it]=Aggiunge alla barra di stato alcune icone aggiuntive ed uno strumento di ingrandimento Comment[nl]=Voegt extra pictogrammen en zoomwidget toe aan de statusbalk Comment[nn]=Leggjer til fleire ikon og sideforstørring via statuslinja