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"
This commit is contained in:
parent
83880570c4
commit
bb403a3294
11 changed files with 13 additions and 0 deletions
|
@ -12,6 +12,7 @@
|
||||||
"Name[cs]": "Albert Vaca Cintora",
|
"Name[cs]": "Albert Vaca Cintora",
|
||||||
"Name[en_GB]": "Albert Vaca Cintora",
|
"Name[en_GB]": "Albert Vaca Cintora",
|
||||||
"Name[es]": "Albert Vaca Cintora",
|
"Name[es]": "Albert Vaca Cintora",
|
||||||
|
"Name[fi]": "Albert Vaca Cintora",
|
||||||
"Name[fr]": "Albert Vaca Cintora",
|
"Name[fr]": "Albert Vaca Cintora",
|
||||||
"Name[gl]": "Albert Vaca Cintora",
|
"Name[gl]": "Albert Vaca Cintora",
|
||||||
"Name[ia]": "Albert Vaca Cintora",
|
"Name[ia]": "Albert Vaca Cintora",
|
||||||
|
|
|
@ -55,6 +55,7 @@
|
||||||
"Description[cs]": "Posílejte hlasové příkazy TV, na které běží Plasma Bigscreen",
|
"Description[cs]": "Posílejte hlasové příkazy TV, na které běží Plasma Bigscreen",
|
||||||
"Description[en_GB]": "Send voice commands to your TV running Plasma Bigscreen",
|
"Description[en_GB]": "Send voice commands to your TV running Plasma Bigscreen",
|
||||||
"Description[es]": "Envie órdenes de voz a su televisor ejecutando Plasma Bigscreen",
|
"Description[es]": "Envie órdenes de voz a su televisor ejecutando Plasma Bigscreen",
|
||||||
|
"Description[fi]": "Lähetä Plasma Bigscreen -TV:lle äänikomentoja",
|
||||||
"Description[fr]": "Envoyer des commandes vocales vers votre télévision fonctionnant avec Plasma Bigscreen.",
|
"Description[fr]": "Envoyer des commandes vocales vers votre télévision fonctionnant avec Plasma Bigscreen.",
|
||||||
"Description[gl]": "Enviar ordes de voz a un televisor que use Plasma Bigscreen",
|
"Description[gl]": "Enviar ordes de voz a un televisor que use Plasma Bigscreen",
|
||||||
"Description[ia]": "Invia commandos de voce a tu TV executante Bigscreen de Plasma",
|
"Description[ia]": "Invia commandos de voce a tu TV executante Bigscreen de Plasma",
|
||||||
|
@ -82,6 +83,7 @@
|
||||||
"Name[cs]": "Hlasové ovládání pro Bigscreen",
|
"Name[cs]": "Hlasové ovládání pro Bigscreen",
|
||||||
"Name[en_GB]": "Bigscreen voice control",
|
"Name[en_GB]": "Bigscreen voice control",
|
||||||
"Name[es]": "Control de voz de Bigscreen",
|
"Name[es]": "Control de voz de Bigscreen",
|
||||||
|
"Name[fi]": "Bigscreen-äänen hallinta",
|
||||||
"Name[fr]": "Contrôle vocal pour Bigscreen",
|
"Name[fr]": "Contrôle vocal pour Bigscreen",
|
||||||
"Name[gl]": "Control de voz de Bigscreen",
|
"Name[gl]": "Control de voz de Bigscreen",
|
||||||
"Name[ia]": "Controlo de voce de BigScreen",
|
"Name[ia]": "Controlo de voce de BigScreen",
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
"Name[cs]": "Albert Vaca Cintora",
|
"Name[cs]": "Albert Vaca Cintora",
|
||||||
"Name[en_GB]": "Albert Vaca Cintora",
|
"Name[en_GB]": "Albert Vaca Cintora",
|
||||||
"Name[es]": "Albert Vaca Cintora",
|
"Name[es]": "Albert Vaca Cintora",
|
||||||
|
"Name[fi]": "Albert Vaca Cintora",
|
||||||
"Name[fr]": "Albert Vaca Cintora",
|
"Name[fr]": "Albert Vaca Cintora",
|
||||||
"Name[gl]": "Albert Vaca Cintora",
|
"Name[gl]": "Albert Vaca Cintora",
|
||||||
"Name[ia]": "Albert Vaca Cintora",
|
"Name[ia]": "Albert Vaca Cintora",
|
||||||
|
|
|
@ -868,6 +868,7 @@ Name[cs]=Text byl přijat
|
||||||
Name[de]=Text empfangen
|
Name[de]=Text empfangen
|
||||||
Name[en_GB]=Text Received
|
Name[en_GB]=Text Received
|
||||||
Name[es]=Texto recibido
|
Name[es]=Texto recibido
|
||||||
|
Name[fi]=Vastaanotettiin tekstiä
|
||||||
Name[fr]=Texte reçu
|
Name[fr]=Texte reçu
|
||||||
Name[gl]=Recibiuse texto
|
Name[gl]=Recibiuse texto
|
||||||
Name[ia]=Texto Recipite
|
Name[ia]=Texto Recipite
|
||||||
|
@ -892,6 +893,7 @@ Comment[ca@valencia]=S'ha rebut text
|
||||||
Comment[cs]=Byl přijat nějaký text
|
Comment[cs]=Byl přijat nějaký text
|
||||||
Comment[en_GB]=Received some text
|
Comment[en_GB]=Received some text
|
||||||
Comment[es]=Ha recibido un texto
|
Comment[es]=Ha recibido un texto
|
||||||
|
Comment[fi]=Vastaanotettiin tekstiä
|
||||||
Comment[fr]=Réception de quelques éléments de texte
|
Comment[fr]=Réception de quelques éléments de texte
|
||||||
Comment[gl]=Recibiuse un texto
|
Comment[gl]=Recibiuse un texto
|
||||||
Comment[ia]=Recipite alcun texto
|
Comment[ia]=Recipite alcun texto
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
"Name[cs]": "Albert Vaca Cintora",
|
"Name[cs]": "Albert Vaca Cintora",
|
||||||
"Name[en_GB]": "Albert Vaca Cintora",
|
"Name[en_GB]": "Albert Vaca Cintora",
|
||||||
"Name[es]": "Albert Vaca Cintora",
|
"Name[es]": "Albert Vaca Cintora",
|
||||||
|
"Name[fi]": "Albert Vaca Cintora",
|
||||||
"Name[fr]": "Albert Vaca Cintora",
|
"Name[fr]": "Albert Vaca Cintora",
|
||||||
"Name[gl]": "Albert Vaca Cintora",
|
"Name[gl]": "Albert Vaca Cintora",
|
||||||
"Name[ia]": "Albert Vaca Cintora",
|
"Name[ia]": "Albert Vaca Cintora",
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
"Name[cs]": "Albert Vaca Cintora",
|
"Name[cs]": "Albert Vaca Cintora",
|
||||||
"Name[en_GB]": "Albert Vaca Cintora",
|
"Name[en_GB]": "Albert Vaca Cintora",
|
||||||
"Name[es]": "Albert Vaca Cintora",
|
"Name[es]": "Albert Vaca Cintora",
|
||||||
|
"Name[fi]": "Albert Vaca Cintora",
|
||||||
"Name[fr]": "Albert Vaca Cintora",
|
"Name[fr]": "Albert Vaca Cintora",
|
||||||
"Name[gl]": "Albert Vaca Cintora",
|
"Name[gl]": "Albert Vaca Cintora",
|
||||||
"Name[ia]": "Albert Vaca Cintora",
|
"Name[ia]": "Albert Vaca Cintora",
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
"Name[cs]": "Albert Vaca Cintora",
|
"Name[cs]": "Albert Vaca Cintora",
|
||||||
"Name[en_GB]": "Albert Vaca Cintora",
|
"Name[en_GB]": "Albert Vaca Cintora",
|
||||||
"Name[es]": "Albert Vaca Cintora",
|
"Name[es]": "Albert Vaca Cintora",
|
||||||
|
"Name[fi]": "Albert Vaca Cintora",
|
||||||
"Name[fr]": "Albert Vaca Cintora",
|
"Name[fr]": "Albert Vaca Cintora",
|
||||||
"Name[gl]": "Albert Vaca Cintora",
|
"Name[gl]": "Albert Vaca Cintora",
|
||||||
"Name[ia]": "Albert Vaca Cintora",
|
"Name[ia]": "Albert Vaca Cintora",
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
"Name[cs]": "Albert Vaca Cintora",
|
"Name[cs]": "Albert Vaca Cintora",
|
||||||
"Name[en_GB]": "Albert Vaca Cintora",
|
"Name[en_GB]": "Albert Vaca Cintora",
|
||||||
"Name[es]": "Albert Vaca Cintora",
|
"Name[es]": "Albert Vaca Cintora",
|
||||||
|
"Name[fi]": "Albert Vaca Cintora",
|
||||||
"Name[fr]": "Albert Vaca Cintora",
|
"Name[fr]": "Albert Vaca Cintora",
|
||||||
"Name[gl]": "Albert Vaca Cintora",
|
"Name[gl]": "Albert Vaca Cintora",
|
||||||
"Name[ia]": "Albert Vaca Cintora",
|
"Name[ia]": "Albert Vaca Cintora",
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
"Name[cs]": "Albert Vaca Cintora",
|
"Name[cs]": "Albert Vaca Cintora",
|
||||||
"Name[en_GB]": "Albert Vaca Cintora",
|
"Name[en_GB]": "Albert Vaca Cintora",
|
||||||
"Name[es]": "Albert Vaca Cintora",
|
"Name[es]": "Albert Vaca Cintora",
|
||||||
|
"Name[fi]": "Albert Vaca Cintora",
|
||||||
"Name[fr]": "Albert Vaca Cintora",
|
"Name[fr]": "Albert Vaca Cintora",
|
||||||
"Name[gl]": "Albert Vaca Cintora",
|
"Name[gl]": "Albert Vaca Cintora",
|
||||||
"Name[ia]": "Albert Vaca Cintora",
|
"Name[ia]": "Albert Vaca Cintora",
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
"Name[cs]": "Albert Vaca Cintora",
|
"Name[cs]": "Albert Vaca Cintora",
|
||||||
"Name[en_GB]": "Albert Vaca Cintora",
|
"Name[en_GB]": "Albert Vaca Cintora",
|
||||||
"Name[es]": "Albert Vaca Cintora",
|
"Name[es]": "Albert Vaca Cintora",
|
||||||
|
"Name[fi]": "Albert Vaca Cintora",
|
||||||
"Name[fr]": "Albert Vaca Cintora",
|
"Name[fr]": "Albert Vaca Cintora",
|
||||||
"Name[gl]": "Albert Vaca Cintora",
|
"Name[gl]": "Albert Vaca Cintora",
|
||||||
"Name[ia]": "Albert Vaca Cintora",
|
"Name[ia]": "Albert Vaca Cintora",
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
"Name[cs]": "Albert Vaca Cintora",
|
"Name[cs]": "Albert Vaca Cintora",
|
||||||
"Name[en_GB]": "Albert Vaca Cintora",
|
"Name[en_GB]": "Albert Vaca Cintora",
|
||||||
"Name[es]": "Albert Vaca Cintora",
|
"Name[es]": "Albert Vaca Cintora",
|
||||||
|
"Name[fi]": "Albert Vaca Cintora",
|
||||||
"Name[fr]": "Albert Vaca Cintora",
|
"Name[fr]": "Albert Vaca Cintora",
|
||||||
"Name[gl]": "Albert Vaca Cintora",
|
"Name[gl]": "Albert Vaca Cintora",
|
||||||
"Name[ia]": "Albert Vaca Cintora",
|
"Name[ia]": "Albert Vaca Cintora",
|
||||||
|
|
Loading…
Reference in a new issue