Commit 9bb54993 authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 0346ce6b
Pipeline #39358 skipped
......@@ -2,6 +2,7 @@
......@@ -28,6 +29,7 @@ Name[zh_TW]=範例
Description=Example theme for header.
Description[ar]=سمة مثال للتّرويسة.
Description[ca]=Tema d'exemple per a la capçalera.
Description[ca@valencia]=Tema d'exemple per a la capçalera.
Description[da]=Eksempeltema på header.
Description[de]=Beispieldesign für den Vorspann.
Description[en_GB]=Example theme for header.
......@@ -2,6 +2,7 @@
Name=Example fancy
Name[ar]=مثال عن الخياليّة
Name[ca]=Exemple elegant
Name[ca@valencia]=Exemple elegant
Name[da]=Eksempel på flot
Name[de]=Dekoratives Beispiel
Name[en_GB]=Example fancy
......@@ -28,6 +29,7 @@ Name[zh_TW]=Example fancy
Description=Create fancy theme with grantlee.
Description[ar]=أنشئ سمة خياليّة بِ‍«غرانتلي».
Description[ca]=Crea un tema elegant amb les Grantlee.
Description[ca@valencia]=Crea un tema elegant amb les Grantlee.
Description[da]=Opret flot tema med grantlee.
Description[de]=Dekoratives mit Grantlee erstelltes Design
Description[en_GB]=Create fancy theme with grantlee.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment