From a44977f2fe46d9866b3554b57a0e62b12295273a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 23 Feb 2022 01:47:06 +0000 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" --- quicksettings/keyboardtoggle/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/quicksettings/keyboardtoggle/metadata.desktop b/quicksettings/keyboardtoggle/metadata.desktop index 352137fd..dfafb8fe 100644 --- a/quicksettings/keyboardtoggle/metadata.desktop +++ b/quicksettings/keyboardtoggle/metadata.desktop @@ -3,6 +3,7 @@ [Desktop Entry] Name=Virtual Keyboard Toggle +Name[az]=Virtual klaviatura keçidi Name[ca]=Commutació del teclat virtual Name[en_GB]=Virtual Keyboard Toggle Name[es]=Conmutación del teclado virtual