From 0cae9918048a9e3ae4d1651c6e6a1ba763993a0f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 18 May 2018 07:38:55 +0200 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" --- effects/login/package/metadata.desktop | 2 +- scripts/synchronizeskipswitcher/metadata.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/effects/login/package/metadata.desktop b/effects/login/package/metadata.desktop index 98f840ab13..b3d05e0f9f 100644 --- a/effects/login/package/metadata.desktop +++ b/effects/login/package/metadata.desktop @@ -33,7 +33,7 @@ Name[hr]=Prijava Name[hsb]=Přizjewjenje Name[hu]=Bejelentkezés Name[ia]=Accesso de identification -Name[id]=Log Masuk +Name[id]=Login Name[is]=Innskráning Name[it]=Accesso Name[ja]=ログイン diff --git a/scripts/synchronizeskipswitcher/metadata.desktop b/scripts/synchronizeskipswitcher/metadata.desktop index b227fad91d..e176286cd8 100644 --- a/scripts/synchronizeskipswitcher/metadata.desktop +++ b/scripts/synchronizeskipswitcher/metadata.desktop @@ -16,7 +16,7 @@ Name[fr]=Synchroniser le sélecteur de fenêtres à ignorer avec la barre de tâ Name[gl]=Sincronizar o ignorar o alternador coa barra de tarefas Name[hu]=Skip-váltó szinkronizálása a feladatsávval Name[ia]=Synchronisa Commutator de salto con Barra de carga -Name[id]=Sinkronisasi Pengganti Lewatkan dengan Bilah Tugas +Name[id]=Sinkronisasi Pengganti Lewatkankan dengan Bilah Tugas Name[it]=Sincronizza Salta barra delle applicazioni con la barra delle applicazioni Name[kk]=Терезе көрсету күйін ауыстырғышты тапсырма панелімен қадамдастыру Name[km]=ធ្វើ​សមកាលម្ម​​ដោយ​រំលង​ឧបករណ៍​ប្ដូរ​​ជា​មួយ​របារ​ភារកិច្ច